diff options
| author | Senthil Kumaran <orsenthil@gmail.com> | 2010-11-18 16:44:38 (GMT) |
|---|---|---|
| committer | Senthil Kumaran <orsenthil@gmail.com> | 2010-11-18 16:44:38 (GMT) |
| commit | 723a7a6d93306b3b49be3b2ebe06accb8e3fd1bc (patch) | |
| tree | 4953ea259d3acae66659ba98afb02d50c05eeb0b /Lib/urllib | |
| parent | f2849f0fb445769a50b5331356f143864c5ce770 (diff) | |
| download | cpython-723a7a6d93306b3b49be3b2ebe06accb8e3fd1bc.zip cpython-723a7a6d93306b3b49be3b2ebe06accb8e3fd1bc.tar.gz cpython-723a7a6d93306b3b49be3b2ebe06accb8e3fd1bc.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')
| -rw-r--r-- | Lib/urllib/parse.py | 2 | ||||
| -rw-r--r-- | Lib/urllib/request.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Lib/urllib/parse.py b/Lib/urllib/parse.py index 765f1c8..b437d6f 100644 --- a/Lib/urllib/parse.py +++ b/Lib/urllib/parse.py @@ -700,7 +700,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 diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py index 464f847..5a67c0b 100644 --- a/Lib/urllib/request.py +++ b/Lib/urllib/request.py @@ -1275,8 +1275,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) |