[Jython-checkins] jython: _hashlib will support sha224 in a future JDK with it. Update test_support.

frank.wierzbicki jython-checkins at python.org
Fri Mar 16 00:22:53 CET 2012


http://hg.python.org/jython/rev/6a58525690f9
changeset:   6397:6a58525690f9
user:        Frank Wierzbicki <fwierzbicki at gmail.com>
date:        Thu Mar 15 16:22:47 2012 -0700
summary:
  _hashlib will support sha224 in a future JDK with it. Update test_support.

files:
  Lib/test/test_support.py             |  6 ++++++
  src/org/python/modules/_hashlib.java |  6 ++----
  2 files changed, 8 insertions(+), 4 deletions(-)


diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py
--- a/Lib/test/test_support.py
+++ b/Lib/test/test_support.py
@@ -5,6 +5,7 @@
 
 import contextlib
 import errno
+import functools
 import socket
 import sys
 import os
@@ -14,6 +15,11 @@
 import unittest
 import importlib
 import re
+try:
+    import thread
+except ImportError:
+    thread = None
+
 
 __all__ = ["Error", "TestFailed", "ResourceDenied", "import_module",
            "verbose", "use_resources", "max_memuse", "record_original_stdout",
diff --git a/src/org/python/modules/_hashlib.java b/src/org/python/modules/_hashlib.java
--- a/src/org/python/modules/_hashlib.java
+++ b/src/org/python/modules/_hashlib.java
@@ -81,9 +81,7 @@
     }
 
     public static PyObject openssl_sha224(PyObject obj) {
-        //FIXME: WRONG!
-        return new$("sha256", obj);
-        //return new$("sha224", obj);
+        return new$("sha224", obj);
     }
 
     public static PyObject openssl_sha256() {
@@ -129,7 +127,7 @@
         private static final Map<String, Integer> blockSizes = new HashMap<String, Integer>() {{
                 put("md5", 64);
                 put("sha-1", 64);
-                //put("sha-224", 64);
+                put("sha-224", 64);
                 put("sha-256", 64);
                 put("sha-384", 128);
                 put("sha-512", 128);

-- 
Repository URL: http://hg.python.org/jython


More information about the Jython-checkins mailing list