summaryrefslogtreecommitdiffstats
path: root/Lib/urllib
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2012-05-19 14:15:19 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2012-05-19 14:15:19 (GMT)
commit6709b7d5d1b8643856a3e0f864c0657a927f427a (patch)
tree56ca8f96edcb3a3e158e42c7003efdae583f1a11 /Lib/urllib
parent5fa4a896016e8a265b6afee64c61a1083c6ffa47 (diff)
downloadcpython-6709b7d5d1b8643856a3e0f864c0657a927f427a.zip
cpython-6709b7d5d1b8643856a3e0f864c0657a927f427a.tar.gz
cpython-6709b7d5d1b8643856a3e0f864c0657a927f427a.tar.bz2
#14072: Fix parsing of tel URIs in urlparse by making the check for ports stricter.
Diffstat (limited to 'Lib/urllib')
-rw-r--r--Lib/urllib/parse.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/Lib/urllib/parse.py b/Lib/urllib/parse.py
index 47b7962..92170ad 100644
--- a/Lib/urllib/parse.py
+++ b/Lib/urllib/parse.py
@@ -338,12 +338,12 @@ def urlsplit(url, scheme='', allow_fragments=True):
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:]
+ # make sure "url" is not actually a port number (in which case
+ # "scheme" is really part of the path)
+ rest = url[i+1:]
+ if not rest or any(c not in '0123456789' for c in rest):
+ # not a port number
+ scheme, url = url[:i].lower(), rest
if url[:2] == '//':
netloc, url = _splitnetloc(url, 2)