From 76c28f7ce27ea48254e152032d25ded3117973cb Mon Sep 17 00:00:00 2001 From: "Gregory P. Smith" Date: Sat, 21 Jul 2012 21:19:53 -0700 Subject: Consistently raise a TypeError when a non str is passed to hashlib.new regardless of which of the two implementations of new is used. --- 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 index 9108095..21454c7 100644 --- a/Lib/hashlib.py +++ b/Lib/hashlib.py @@ -88,7 +88,7 @@ def __get_builtin_constructor(name): 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 index 97981dd..29d3a1c 100644 --- a/Lib/test/test_hashlib.py +++ b/Lib/test/test_hashlib.py @@ -111,12 +111,8 @@ class HashLibTestCase(unittest.TestCase): 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 @@ class HashLibTestCase(unittest.TestCase): 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: -- cgit v0.12