From 24ef3e967f4698da6c85778408e920f6437ed344 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Sat, 30 Jun 2012 17:27:56 +0200 Subject: Issue #15225: improve error message when hmac is passed a wrong key type. Patch by Marc Abramowitz. --- Lib/hmac.py | 2 +- Lib/test/test_hmac.py | 12 ++++++++++++ Misc/ACKS | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Lib/hmac.py b/Lib/hmac.py index 9c08023..4297a71 100644 --- a/Lib/hmac.py +++ b/Lib/hmac.py @@ -35,7 +35,7 @@ class HMAC: """ if not isinstance(key, bytes): - raise TypeError("expected bytes, but got %r" % type(key).__name__) + raise TypeError("key: expected bytes, but got %r" % type(key).__name__) if digestmod is None: import hashlib diff --git a/Lib/test/test_hmac.py b/Lib/test/test_hmac.py index 11cacb4..4ca7cec 100644 --- a/Lib/test/test_hmac.py +++ b/Lib/test/test_hmac.py @@ -234,6 +234,18 @@ class ConstructorTestCase(unittest.TestCase): except: self.fail("Standard constructor call raised exception.") + def test_with_str_key(self): + # Pass a key of type str, which is an error, because it expects a key + # of type bytes + with self.assertRaises(TypeError): + h = hmac.HMAC("key") + + def test_dot_new_with_str_key(self): + # Pass a key of type str, which is an error, because it expects a key + # of type bytes + with self.assertRaises(TypeError): + h = hmac.new("key") + def test_withtext(self): # Constructor call with text. try: diff --git a/Misc/ACKS b/Misc/ACKS index e2a4f9b..9af9dcd 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -13,6 +13,7 @@ and the list is in rough alphabetical order by last names. Rajiv Abraham David Abrahams +Marc Abramowitz Ron Adam Ali Afshar Jim Ahlstrom -- cgit v0.12