Index: Lib/urllib.py =================================================================== --- Lib/urllib.py (revision 82985) +++ Lib/urllib.py (working copy) @@ -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 Index: Lib/urllib2.py =================================================================== --- Lib/urllib2.py (revision 82985) +++ Lib/urllib2.py (working copy) @@ -1328,7 +1328,7 @@ user, passwd = splitpasswd(user) else: passwd = None - host = unquote(host) + #host = unquote(host) user = unquote(user or '') passwd = unquote(passwd or '')