diff options
Diffstat (limited to 'Lib')
| -rwxr-xr-x | Lib/test/test_urlparse.py | 7 | ||||
| -rw-r--r-- | Lib/urllib/parse.py | 12 |
2 files changed, 13 insertions, 6 deletions
diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py index 5784381..73150cf 100755 --- a/Lib/test/test_urlparse.py +++ b/Lib/test/test_urlparse.py @@ -806,6 +806,13 @@ class UrlParseTestCase(unittest.TestCase): encoding='utf-8') self.assertRaises(TypeError, urllib.parse.quote, b'foo', errors='strict') + def test_issue14072(self): + p1 = urllib.parse.urlsplit('tel:+31-641044153') + self.assertEqual(p1.scheme, 'tel') + self.assertEqual(p1.path, '+31-641044153') + p2 = urllib.parse.urlsplit('tel:+31641044153') + self.assertEqual(p2.scheme, 'tel') + self.assertEqual(p2.path, '+31641044153') def test_main(): support.run_unittest(UrlParseTestCase) 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) |