summaryrefslogtreecommitdiff
path: root/Lib/urllib/request.py
diff options
context:
space:
mode:
authorguido <guido@google.com>2011-03-29 12:02:49 -0700
committerguido <guido@google.com>2011-03-29 12:02:49 -0700
commitcea1c1161964fc314a0e3dd68e74ceb563fc528c (patch)
tree89c6f150cb5aec505ea2e0e3df746f50b3e85050 /Lib/urllib/request.py
parent7e603d1d2989bfb010d3641a3e152df13e0afbb0 (diff)
parentdff28659880a2ce62ef2c87dc7de58aaa86b85fc (diff)
downloadcpython-cea1c1161964fc314a0e3dd68e74ceb563fc528c.tar.gz
Merge Issue 11662 from 3.2 branch.
Diffstat (limited to 'Lib/urllib/request.py')
-rw-r--r--Lib/urllib/request.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
index ebbebe945b..304bf5978b 100644
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -1863,7 +1863,7 @@ class URLopener:
if encoding == 'base64':
import base64
# XXX is this encoding/decoding ok?
- data = base64.decodebytes(data.encode('ascii')).decode('latin1')
+ data = base64.decodebytes(data.encode('ascii')).decode('latin-1')
else:
data = unquote(data)
msg.append('Content-Length: %d' % len(data))