summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2002-08-18 20:08:56 (GMT)
committerRaymond Hettinger <python@rcn.com>2002-08-18 20:08:56 (GMT)
commitf2e45dd9dde5fa45afeb2bb42660a5a1a2d199d5 (patch)
treef412f144852ac92191983d81ef779818c3bee191
parent1d0eeec279ad9b4f45c3fca667078ba8affa7bd8 (diff)
downloadcpython-f2e45dd9dde5fa45afeb2bb42660a5a1a2d199d5.zip
cpython-f2e45dd9dde5fa45afeb2bb42660a5a1a2d199d5.tar.gz
cpython-f2e45dd9dde5fa45afeb2bb42660a5a1a2d199d5.tar.bz2
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.
-rw-r--r--Lib/urllib.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/urllib.py b/Lib/urllib.py
index d367dd8..758ab92 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))