diff options
| author | Senthil Kumaran <orsenthil@gmail.com> | 2009-03-30 21:54:41 +0000 |
|---|---|---|
| committer | Senthil Kumaran <orsenthil@gmail.com> | 2009-03-30 21:54:41 +0000 |
| commit | 3080a547507b5156f97828974392866b1f811294 (patch) | |
| tree | cc704c240a9f664a44eb578c2e440652ce7edd98 /Lib/urllib/parse.py | |
| parent | 46f2b5e55341893fa367f64723f13c2bad1b0c6d (diff) | |
| download | cpython-3080a547507b5156f97828974392866b1f811294.tar.gz | |
Fix for Issue4962, issue4675.
Diffstat (limited to 'Lib/urllib/parse.py')
| -rw-r--r-- | Lib/urllib/parse.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/urllib/parse.py b/Lib/urllib/parse.py index 5fd038e169..903368329b 100644 --- a/Lib/urllib/parse.py +++ b/Lib/urllib/parse.py @@ -19,7 +19,7 @@ uses_relative = ['ftp', 'http', 'gopher', 'nntp', 'imap', uses_netloc = ['ftp', 'http', 'gopher', 'nntp', 'telnet', 'imap', 'wais', 'file', 'mms', 'https', 'shttp', 'snews', 'prospero', 'rtsp', 'rtspu', 'rsync', '', - 'svn', 'svn+ssh', 'sftp'] + 'svn', 'svn+ssh', 'sftp','nfs'] non_hierarchical = ['gopher', 'hdl', 'mailto', 'news', 'telnet', 'wais', 'imap', 'snews', 'sip', 'sips'] uses_params = ['ftp', 'hdl', 'prospero', 'http', 'imap', @@ -645,7 +645,7 @@ def splitpasswd(user): global _passwdprog if _passwdprog is None: import re - _passwdprog = re.compile('^([^:]*):(.*)$') + _passwdprog = re.compile('^([^:]*):(.*)$',re.S) match = _passwdprog.match(user) if match: return match.group(1, 2) |