summaryrefslogtreecommitdiffstats
path: root/Lib/base64.py
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 /Lib/base64.py
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 'Lib/base64.py')
-rwxr-xr-xLib/base64.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/base64.py b/Lib/base64.py
index 82c112c..844907f 100755
--- a/Lib/base64.py
+++ b/Lib/base64.py
@@ -64,9 +64,9 @@ def b64decode(s, altchars=None):
length 2 (additional characters are ignored) which specifies the
alternative alphabet used instead of the '+' and '/' characters.
- The decoded string is returned. A 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 TypeError is raised if s is
+ incorrectly padded. Non-base64-alphabet characters are discarded prior
+ to the padding check.
"""
if altchars is not None:
s = s.translate(string.maketrans(altchars[:2], '+/'))