Fix verb tense in base64 docs, and the phrasing of a news entry.

diff --git a/Doc/library/base64.rst b/Doc/library/base64.rst
index 3b23e795d4269f6a06c88c42d832c5247f1f891a..f0d11b0fa1d1ef8c265e322a6f66573f11db85ea 100644 (file)
--- 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 1306891d2a06e174ab288f776941a495318d93c4..4ad230af6fed5609823869e34d421f4dbe177d2e 100644 (file)
--- 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