[Python-checkins] cpython (3.2): Consistently raise a TypeError when a non str is passed to hashlib.new

[gregory.p.smith]

http://hg.python.org/cpython/rev/c97cfe04880f
changeset:   78235:c97cfe04880f
branch:      3.2
parent:      78232:18b114be013e
user:        Gregory P. Smith <greg at krypto.org>
date:        Sat Jul 21 21:19:53 2012 -0700
summary:
  Consistently raise a TypeError when a non str is passed to hashlib.new
regardless of which of the two implementations of new is used.

files:
  Lib/hashlib.py           |  2 +-
  Lib/test/test_hashlib.py |  9 +++------
  2 files changed, 4 insertions(+), 7 deletions(-)


diff --git a/Lib/hashlib.py b/Lib/hashlib.py
--- a/Lib/hashlib.py
+++ b/Lib/hashlib.py
@@ -88,7 +88,7 @@
     except ImportError:
         pass  # no extension module, this hash is unsupported.
 
-    raise ValueError('unsupported hash type %s' % name)
+    raise ValueError('unsupported hash type ' + name)
 
 
 def __get_openssl_constructor(name):
diff --git a/Lib/test/test_hashlib.py b/Lib/test/test_hashlib.py
--- a/Lib/test/test_hashlib.py
+++ b/Lib/test/test_hashlib.py
@@ -111,12 +111,8 @@
                             issubset(hashlib.algorithms_available))
 
     def test_unknown_hash(self):
-        try:
-            hashlib.new('spam spam spam spam spam')
-        except ValueError:
-            pass
-        else:
-            self.assertTrue(0 == "hashlib didn't reject bogus hash name")
+        self.assertRaises(ValueError, hashlib.new, 'spam spam spam spam spam')
+        self.assertRaises(TypeError, hashlib.new, 1)
 
     def test_get_builtin_constructor(self):
         get_builtin_constructor = hashlib.__dict__[
@@ -135,6 +131,7 @@
                 sys.modules['_md5'] = _md5
             else:
                 del sys.modules['_md5']
+        self.assertRaises(TypeError, get_builtin_constructor, 3)
 
     def test_hexdigest(self):
         for name in self.supported_hash_names:

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