summaryrefslogtreecommitdiff
path: root/Lib/urlparse.py
diff options
context:
space:
mode:
authorSenthil Kumaran <orsenthil@gmail.com>2011-04-15 18:07:33 +0800
committerSenthil Kumaran <orsenthil@gmail.com>2011-04-15 18:07:33 +0800
commitddaea1c38a8d4d3befe378738a1bd02637347231 (patch)
tree7a84e5893d595af9fe9263bd3c8aadc69277365b /Lib/urlparse.py
parent1bb18cc39e21fb0acbfde6dadbd6c432f19c4513 (diff)
downloadcpython-git-ddaea1c38a8d4d3befe378738a1bd02637347231.tar.gz
Issue #11467: Fix urlparse behavior when handling urls which contains scheme
specific part only digits. Patch by Santoso Wijaya.
Diffstat (limited to 'Lib/urlparse.py')
-rw-r--r--Lib/urlparse.py14
1 files changed, 9 insertions, 5 deletions
diff --git a/Lib/urlparse.py b/Lib/urlparse.py
index a019a7b7a4..e5528face6 100644
--- a/Lib/urlparse.py
+++ b/Lib/urlparse.py
@@ -187,11 +187,15 @@ 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] == '//':