summaryrefslogtreecommitdiffstats
path: root/Lib/urllib/request.py
diff options
context:
space:
mode:
authorSenthil Kumaran <orsenthil@gmail.com>2010-11-18 15:36:41 (GMT)
committerSenthil Kumaran <orsenthil@gmail.com>2010-11-18 15:36:41 (GMT)
commitdaa29d01b749daa4843bcac80bd0067a827cfb8a (patch)
tree17725f0e7801121e5308a09b14d45d2b71bebb98 /Lib/urllib/request.py
parentd8b661dd908629b5fc0f50e3e0c5fc5c85f9cb72 (diff)
downloadcpython-daa29d01b749daa4843bcac80bd0067a827cfb8a.zip
cpython-daa29d01b749daa4843bcac80bd0067a827cfb8a.tar.gz
cpython-daa29d01b749daa4843bcac80bd0067a827cfb8a.tar.bz2
Fix Issue2244 - urllib unquotes user and password info multiple times - Patch by Theodore Turocy
Diffstat (limited to 'Lib/urllib/request.py')
-rw-r--r--Lib/urllib/request.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
index 9674b96..f3fb7be 100644
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -1300,8 +1300,8 @@ class FTPHandler(BaseHandler):
else:
passwd = None
host = unquote(host)
- user = unquote(user or '')
- passwd = unquote(passwd or '')
+ user = user or ''
+ passwd = passwd or ''
try:
host = socket.gethostbyname(host)