[Python-checkins] cpython (merge 3.3 -> default): Merge: Fix verb tense in base64 docs, and the phrasing of a news entry.

[r.david.murray]

http://hg.python.org/cpython/rev/ef83c1414c85
changeset:   88361:ef83c1414c85
parent:      88358:57dd16953c8c
parent:      88360:04dabdbd512c
user:        R David Murray <rdmurray at bitdance.com>
date:        Wed Jan 08 18:14:20 2014 -0500
summary:
  Merge: Fix verb tense in base64 docs, and the phrasing of a news entry.

files:
  Doc/library/base64.rst |  2 +-
  Misc/NEWS              |  6 +++---
  2 files changed, 4 insertions(+), 4 deletions(-)


diff --git a/Doc/library/base64.rst b/Doc/library/base64.rst
--- a/Doc/library/base64.rst
+++ b/Doc/library/base64.rst
@@ -107,7 +107,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:`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
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -2131,9 +2131,9 @@
 - 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 #18072: Implement importlib.abc.InspectLoader.get_code() and
   importlib.abc.ExecutionLoader.get_code().

-- 
Repository URL: http://hg.python.org/cpython