[Python-checkins] cpython (merge 3.2 -> default): #14072: merge with 3.2.
ezio.melotti
python-checkins at python.org
Sat May 19 16:16:33 CEST 2012
http://hg.python.org/cpython/rev/b78c67665a7f
changeset: 77053:b78c67665a7f
parent: 77050:d38e821c1b80
parent: 77052:9f6b7576c08c
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Sat May 19 17:16:22 2012 +0300
summary:
#14072: merge with 3.2.
files:
Lib/test/test_urlparse.py | 7 +++++++
Lib/urllib/parse.py | 12 ++++++------
Misc/NEWS | 3 +++
3 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py
--- a/Lib/test/test_urlparse.py
+++ b/Lib/test/test_urlparse.py
@@ -806,6 +806,13 @@
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
--- a/Lib/urllib/parse.py
+++ b/Lib/urllib/parse.py
@@ -338,12 +338,12 @@
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)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -44,6 +44,9 @@
- Issue #14721: Send the correct 'Content-length: 0' header when the body is an
empty string ''. Initial Patch contributed by Arve Knudsen.
+- Issue #14072: Fix parsing of 'tel' URIs in urlparse by making the check for
+ ports stricter.
+
- Issue #9374: Generic parsing of query and fragment portions of url for any
scheme. Supported both by RFC3986 and RFC2396.
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list