summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2007-08-29 02:30:49 (GMT)
committerGuido van Rossum <guido@python.org>2007-08-29 02:30:49 (GMT)
commit083e20c8e1ed95b98e9b1f02173eccb15f307424 (patch)
tree574234b60afef74c545be2cebca0181e9e7eee74
parent022c4746791d467d9a28576fd913cdb889cdebe1 (diff)
downloadcpython-083e20c8e1ed95b98e9b1f02173eccb15f307424.zip
cpython-083e20c8e1ed95b98e9b1f02173eccb15f307424.tar.gz
cpython-083e20c8e1ed95b98e9b1f02173eccb15f307424.tar.bz2
Forgot one. This makes test_urllib2.py pass.
-rwxr-xr-xLib/base64.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/base64.py b/Lib/base64.py
index 1b9f560..e100e0f 100755
--- a/Lib/base64.py
+++ b/Lib/base64.py
@@ -50,7 +50,7 @@ def b64encode(s, altchars=None):
The encoded byte string is returned.
"""
if not isinstance(s, bytes):
- s = bytes(s)
+ s = bytes(s, "ascii")
# Strip off the trailing newline
encoded = binascii.b2a_base64(s)[:-1]
if altchars is not None: