summaryrefslogtreecommitdiffstats
path: root/Lib/urllib
diff options
context:
space:
mode:
authorSenthil Kumaran <orsenthil@gmail.com>2011-04-15 10:20:24 (GMT)
committerSenthil Kumaran <orsenthil@gmail.com>2011-04-15 10:20:24 (GMT)
commit397eb4411a076825766cb2b71e78b585ff3a4d24 (patch)
tree7fcde7fea93e3845dc97795e82e7aa46264263c0 /Lib/urllib
parent20f53f1fe79a5df68fe9d8390679115fdaebc65b (diff)
downloadcpython-397eb4411a076825766cb2b71e78b585ff3a4d24.zip
cpython-397eb4411a076825766cb2b71e78b585ff3a4d24.tar.gz
cpython-397eb4411a076825766cb2b71e78b585ff3a4d24.tar.bz2
Issue #11467: Fix urlparse behavior when handling urls which contains scheme specific part only digits.
Diffstat (limited to 'Lib/urllib')
-rw-r--r--Lib/urllib/parse.py15
1 files changed, 10 insertions, 5 deletions
diff --git a/Lib/urllib/parse.py b/Lib/urllib/parse.py
index b3494fa..a20a3d4 100644
--- a/Lib/urllib/parse.py
+++ b/Lib/urllib/parse.py
@@ -184,12 +184,17 @@ def urlsplit(url, scheme='', allow_fragments=True):
v = SplitResult(scheme, netloc, url, query, fragment)
_parse_cache[key] = v
return v
- if url.endswith(':') or not url[i+1].isdigit():
- for c in url[:i]:
- if c not in scheme_chars:
- break
- else:
+ for c in url[:i]:
+ if c not in scheme_chars:
+ break
+ else:
+ try:
+ # make sure "url" is not actually a port number (in which case
+ # "scheme" is really part of the path
+ _testportnum = int(url[i+1:])
+ except ValueError:
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: