summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Doc/library/base64.rst2
-rw-r--r--Misc/NEWS6
2 files changed, 4 insertions, 4 deletions
diff --git a/Doc/library/base64.rst b/Doc/library/base64.rst
index 3b23e79..f0d11b0 100644
--- a/Doc/library/base64.rst
+++ b/Doc/library/base64.rst
@@ -103,7 +103,7 @@ The modern interface provides:
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:`binascii.Error` is raised if *s* were
+ The decoded byte string is returned. A :exc:`binascii.Error` is raised if *s* is
incorrectly padded or if there are non-alphabet characters present in the
string.
diff --git a/Misc/NEWS b/Misc/NEWS
index 1306891..4ad230a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -710,9 +710,9 @@ Library
- Issue #18025: Fixed a segfault in io.BufferedIOBase.readinto() when raw
stream's read() returns more bytes than requested.
-- 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 #18011: As was originally intended, base64.b32decode() now raises a
+ binascii.Error if there are non-b32-alphabet characters present in the input
+ string, instead of a TypeError.
- 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