changeset:   83949:0b9bcb2ac145
branch:      3.3
parent:      83947:bde91dddbcbc
user:        Serhiy Storchaka <storchaka@gmail.com>
date:        Tue May 28 15:27:29 2013 +0300
files:       Doc/library/base64.rst Lib/base64.py Lib/test/test_base64.py Misc/NEWS
description:
Issue #18011: base64.b32decode() now raises a binascii.Error if there are
non-alphabet characters present in the input string to conform a docstring.
Updated the module documentation.


diff -r bde91dddbcbc -r 0b9bcb2ac145 Doc/library/base64.rst
--- a/Doc/library/base64.rst	Tue May 28 12:49:34 2013 +0300
+++ b/Doc/library/base64.rst	Tue May 28 15:27:29 2013 +0300
@@ -103,7 +103,7 @@
    digit 0 is always mapped to the letter O).  For security purposes the default is
    ``None``, so that 0 and 1 are not allowed in the input.
 
-   The decoded byte string is returned.  A :exc:`TypeError` is raised if *s* were
+   The decoded byte string is returned.  A :exc:`binascii.Error` is raised if *s* were
    incorrectly padded or if there are non-alphabet characters present in the
    string.
 
diff -r bde91dddbcbc -r 0b9bcb2ac145 Lib/base64.py
--- a/Lib/base64.py	Tue May 28 12:49:34 2013 +0300
+++ b/Lib/base64.py	Tue May 28 15:27:29 2013 +0300
@@ -245,7 +245,7 @@
     for c in s:
         val = _b32rev.get(c)
         if val is None:
-            raise TypeError('Non-base32 digit found')
+            raise binascii.Error('Non-base32 digit found')
         acc += _b32rev[c] << shift
         shift -= 5
         if shift < 0:
diff -r bde91dddbcbc -r 0b9bcb2ac145 Lib/test/test_base64.py
--- a/Lib/test/test_base64.py	Tue May 28 12:49:34 2013 +0300
+++ b/Lib/test/test_base64.py	Tue May 28 15:27:29 2013 +0300
@@ -244,8 +244,8 @@
             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 @@
             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):
diff -r bde91dddbcbc -r 0b9bcb2ac145 Misc/NEWS
--- a/Misc/NEWS	Tue May 28 12:49:34 2013 +0300
+++ b/Misc/NEWS	Tue May 28 15:27:29 2013 +0300
@@ -24,6 +24,10 @@
 Library
 -------
 
+- Issue #18011: base64.b32decode() now raises a binascii.Error if there are
+  non-alphabet characters present in the input string to conform a docstring.
+  Updated the module documentation.
+
 - Issue #13772: Restored directory detection of targets in ``os.symlink`` on
   Windows, which was temporarily removed in Python 3.2.3 due to an incomplete
   implementation. The implementation now works even if the symlink is created