Modify splituser() method to allow an @ in the userinfo field.

Jeremy reported that this is not allowed by RFC 2396; however,
other tools support unescaped @'s so we should also.

Apply SF patch 596581 closing bug 581529.

diff --git a/Lib/urllib.py b/Lib/urllib.py
index 8188d4806f592e203a3d0bc9d08c9f816a8e94de..d30fbb9de5dc4e79d513c4f09f58481756bf384a 100644 (file)
--- a/Lib/urllib.py
+++ b/Lib/urllib.py
@@ -954,7 +954,7 @@ def splituser(host):
     global _userprog
     if _userprog is None:
         import re
-        _userprog = re.compile('^([^@]*)@(.*)$')
+        _userprog = re.compile('^(.*)@(.*)$')
 
     match = _userprog.match(host)
     if match: return map(unquote, match.group(1, 2))