From: Raymond Hettinger <python@rcn.com>
Date: Sun, 18 Aug 2002 20:08:56 +0000 (+0000)
Subject: Modify splituser() method to allow an @ in the userinfo field.
X-Git-Tag: v2.3c1~4416
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f2e45dd9dde5fa45afeb2bb42660a5a1a2d199d5;p=thirdparty%2FPython%2Fcpython.git

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 d367dd8677ed..758ab925ca2b 100644
--- a/Lib/urllib.py
+++ b/Lib/urllib.py
@@ -968,7 +968,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))