--- urllib.py	2007-10-05 10:15:34.000000000 -0400
+++ urllib.py	2008-03-06 10:52:48.000000000 -0500
@@ -1047,7 +1047,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
--- urllib2.py	2007-10-05 10:15:34.000000000 -0400
+++ urllib2.py	2008-03-06 10:45:59.000000000 -0500
@@ -247,8 +247,6 @@
     def get_host(self):
         if self.host is None:
             self.host, self.__r_host = splithost(self.__r_type)
-            if self.host:
-                self.host = unquote(self.host)
         return self.host
 
     def get_selector(self):