diff options
Diffstat (limited to 'Lib')
| -rwxr-xr-x | Lib/base64.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_base64.py | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Lib/base64.py b/Lib/base64.py index 0f731fa043..f923244104 100755 --- a/Lib/base64.py +++ b/Lib/base64.py @@ -222,7 +222,7 @@ def b32decode(s, casefold=False, map01=None): for c in quanta: acc = (acc << 5) + b32rev[c] except KeyError: - raise TypeError('Non-base32 digit found') + raise binascii.Error('Non-base32 digit found') decoded += acc.to_bytes(5, 'big') # Process the last, partial quanta if padchars: diff --git a/Lib/test/test_base64.py b/Lib/test/test_base64.py index abba5bf775..13695de67e 100644 --- a/Lib/test/test_base64.py +++ b/Lib/test/test_base64.py @@ -244,8 +244,8 @@ class BaseXYTestCase(unittest.TestCase): eq(base64.b32decode(data, True), res) eq(base64.b32decode(data.decode('ascii'), True), res) - self.assertRaises(TypeError, base64.b32decode, b'me======') - self.assertRaises(TypeError, base64.b32decode, 'me======') + self.assertRaises(binascii.Error, base64.b32decode, b'me======') + self.assertRaises(binascii.Error, base64.b32decode, 'me======') # Mapping zero and one eq(base64.b32decode(b'MLO23456'), b'b\xdd\xad\xf3\xbe') @@ -262,9 +262,11 @@ class BaseXYTestCase(unittest.TestCase): eq(base64.b32decode(data_str, map01=map01), res) eq(base64.b32decode(data, map01=map01_str), res) eq(base64.b32decode(data_str, map01=map01_str), res) + self.assertRaises(binascii.Error, base64.b32decode, data) + self.assertRaises(binascii.Error, base64.b32decode, data_str) def test_b32decode_error(self): - for data in [b'abc', b'ABCDEF==']: + for data in [b'abc', b'ABCDEF==', b'==ABCDEF']: with self.assertRaises(binascii.Error): base64.b32decode(data) with self.assertRaises(binascii.Error): |