Index: Lib/urllib/request.py =================================================================== --- Lib/urllib/request.py (revision 82985) +++ Lib/urllib/request.py (working copy) @@ -1262,8 +1262,8 @@ 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) Index: Lib/urllib/parse.py =================================================================== --- Lib/urllib/parse.py (revision 82985) +++ Lib/urllib/parse.py (working copy) @@ -712,7 +712,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