diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2012-05-19 14:16:22 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2012-05-19 14:16:22 (GMT) |
| commit | ed1183db8b10c6955729824bf5f5bdc430878001 (patch) | |
| tree | d29c8e4c8ffea3f83431ccec43a703c164123d7a /Lib/urllib | |
| parent | d527259f14dd6094f0a417ea83e66b8f233e38a3 (diff) | |
| parent | 6709b7d5d1b8643856a3e0f864c0657a927f427a (diff) | |
| download | cpython-ed1183db8b10c6955729824bf5f5bdc430878001.zip cpython-ed1183db8b10c6955729824bf5f5bdc430878001.tar.gz cpython-ed1183db8b10c6955729824bf5f5bdc430878001.tar.bz2 | |
#14072: merge with 3.2.
Diffstat (limited to 'Lib/urllib')
| -rw-r--r-- | Lib/urllib/parse.py | 12 |
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) |