diff options
| author | R David Murray <rdmurray@bitdance.com> | 2014-01-08 23:14:20 (GMT) |
|---|---|---|
| committer | R David Murray <rdmurray@bitdance.com> | 2014-01-08 23:14:20 (GMT) |
| commit | fdc58fd89753ae5e7e3680e709429e2ac9764f1e (patch) | |
| tree | 4b5cddf1631d759c707a2be221fd779166054a0e | |
| parent | 66bf12a58e08914847d2739a0307780a352e883d (diff) | |
| parent | 78ee3289e991882d803be4cb0dd6b4005f82cbb1 (diff) | |
| download | cpython-fdc58fd89753ae5e7e3680e709429e2ac9764f1e.zip cpython-fdc58fd89753ae5e7e3680e709429e2ac9764f1e.tar.gz cpython-fdc58fd89753ae5e7e3680e709429e2ac9764f1e.tar.bz2 | |
Merge: Fix verb tense in base64 docs, and the phrasing of a news entry.
| -rw-r--r-- | Doc/library/base64.rst | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Doc/library/base64.rst b/Doc/library/base64.rst index a7eed08..3d1f087 100644 --- a/Doc/library/base64.rst +++ b/Doc/library/base64.rst @@ -107,7 +107,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. @@ -2131,9 +2131,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 #18072: Implement importlib.abc.InspectLoader.get_code() and importlib.abc.ExecutionLoader.get_code(). |