summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2015-12-14 03:41:59 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2015-12-14 03:41:59 (GMT)
commitd77fe94b4e2840f9031ba50d2205e97dd9115160 (patch)
tree189d324cbd3e0b229037a2bf2b97c78ca755f8e4 /Doc
parentedd6a817d1794c9e26d3d215ac8f90048fb2a6df (diff)
downloadcpython-d77fe94b4e2840f9031ba50d2205e97dd9115160.zip
cpython-d77fe94b4e2840f9031ba50d2205e97dd9115160.tar.gz
cpython-d77fe94b4e2840f9031ba50d2205e97dd9115160.tar.bz2
Issue #22088: Port base64 character ignoring doc and test from 857d9fe60169
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/base64.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/base64.rst b/Doc/library/base64.rst
index 2a9840b..e346efb 100644
--- a/Doc/library/base64.rst
+++ b/Doc/library/base64.rst
@@ -45,9 +45,9 @@ The modern interface, which was introduced in Python 2.4, provides:
length 2 (additional characters are ignored) which specifies the alternative
alphabet used instead of the ``+`` and ``/`` characters.
- The decoded string is returned. A :exc:`TypeError` is raised if *s* were
- incorrectly padded or if there are non-alphabet characters present in the
- string.
+ The decoded string is returned. A :exc:`TypeError` is raised if *s* is
+ incorrectly padded. Non-base64-alphabet characters are
+ discarded prior to the padding check.
.. function:: standard_b64encode(s)