diff options
| author | Senthil Kumaran <orsenthil@gmail.com> | 2010-08-04 04:53:07 (GMT) |
|---|---|---|
| committer | Senthil Kumaran <orsenthil@gmail.com> | 2010-08-04 04:53:07 (GMT) |
| commit | 8801f7add244421305a3c555cff56d27798b0946 (patch) | |
| tree | f4c909a9c6084fd9407614649559be2adce9931c /Lib/urllib | |
| parent | 9b3383ca65fc0181e3b7a6aacae3539de545591f (diff) | |
| download | cpython-8801f7add244421305a3c555cff56d27798b0946.zip cpython-8801f7add244421305a3c555cff56d27798b0946.tar.gz cpython-8801f7add244421305a3c555cff56d27798b0946.tar.bz2 | |
Merged revisions 83701 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r83701 | senthil.kumaran | 2010-08-04 10:20:44 +0530 (Wed, 04 Aug 2010) | 3 lines
Fix Issue754016 - urlparse goes wrong with IP:port without scheme
........
Diffstat (limited to 'Lib/urllib')
| -rw-r--r-- | Lib/urllib/parse.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Lib/urllib/parse.py b/Lib/urllib/parse.py index 1f54ac6..e1afe52 100644 --- a/Lib/urllib/parse.py +++ b/Lib/urllib/parse.py @@ -183,11 +183,12 @@ def urlsplit(url, scheme='', allow_fragments=True): v = SplitResult(scheme, netloc, url, query, fragment) _parse_cache[key] = v return v - for c in url[:i]: - if c not in scheme_chars: - break - else: - scheme, url = url[:i].lower(), url[i+1:] + if url.endswith(':') or not url[i+1].isdigit(): + for c in url[:i]: + if c not in scheme_chars: + break + else: + scheme, url = url[:i].lower(), url[i+1:] if url[:2] == '//': netloc, url = _splitnetloc(url, 2) if allow_fragments and scheme in uses_fragment and '#' in url: |