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
........
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 @@
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 @@
_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