diff options
| author | Senthil Kumaran <orsenthil@gmail.com> | 2010-11-20 11:24:08 (GMT) |
|---|---|---|
| committer | Senthil Kumaran <orsenthil@gmail.com> | 2010-11-20 11:24:08 (GMT) |
| commit | 9fce551e0e630f8da454b77d46264d812ba57f46 (patch) | |
| tree | 51e17454cef3b313c62b975b57f6be15c3992409 /Lib/urllib.py | |
| parent | 6be0e9fa905bf22fc8ef1df0b57d7b9cef5cf525 (diff) | |
| download | cpython-9fce551e0e630f8da454b77d46264d812ba57f46.zip cpython-9fce551e0e630f8da454b77d46264d812ba57f46.tar.gz cpython-9fce551e0e630f8da454b77d46264d812ba57f46.tar.bz2 | |
Merged revisions 86520 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r86520 | senthil.kumaran | 2010-11-18 23:36:41 +0800 (Thu, 18 Nov 2010) | 3 lines
Fix Issue2244 - urllib unquotes user and password info multiple times - Patch by Theodore Turocy
........
Diffstat (limited to 'Lib/urllib.py')
| -rw-r--r-- | Lib/urllib.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/urllib.py b/Lib/urllib.py index 9c58923..d85dedb 100644 --- a/Lib/urllib.py +++ b/Lib/urllib.py @@ -511,8 +511,8 @@ class URLopener: if user: user, passwd = splitpasswd(user) else: passwd = None host = unquote(host) - user = unquote(user or '') - passwd = unquote(passwd or '') + user = user or '' + passwd = passwd or '' host = socket.gethostbyname(host) if not port: import ftplib @@ -1064,7 +1064,7 @@ def splituser(host): _userprog = re.compile('^(.*)@(.*)$') match = _userprog.match(host) - if match: return map(unquote, match.group(1, 2)) + if match: return match.group(1, 2) return None, host _passwdprog = None |