Commit f2e45dd9 authored by Raymond Hettinger's avatar Raymond Hettinger

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.
parent 1d0eeec2
...@@ -968,7 +968,7 @@ def splituser(host): ...@@ -968,7 +968,7 @@ def splituser(host):
global _userprog global _userprog
if _userprog is None: if _userprog is None:
import re import re
_userprog = re.compile('^([^@]*)@(.*)$') _userprog = re.compile('^(.*)@(.*)$')
match = _userprog.match(host) match = _userprog.match(host)
if match: return map(unquote, match.group(1, 2)) if match: return map(unquote, match.group(1, 2))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment