summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2012-12-24 22:00:20 (GMT)
committerSenthil Kumaran <senthil@uthcode.com>2012-12-24 22:00:20 (GMT)
commited30199e7836ff52a101a9ea3a2b31f8455a85a8 (patch)
tree14b7178ceb041dd0271badb2d860fec4f0adb3cb
parent08bab072917c2eeea3a0f3da0546d57cf5072bcf (diff)
downloadcpython-ed30199e7836ff52a101a9ea3a2b31f8455a85a8.zip
cpython-ed30199e7836ff52a101a9ea3a2b31f8455a85a8.tar.gz
cpython-ed30199e7836ff52a101a9ea3a2b31f8455a85a8.tar.bz2
Fix issue16713 - tel url parsing with params
-rwxr-xr-xLib/test/test_urlparse.py29
-rw-r--r--Lib/urllib/parse.py2
-rw-r--r--Misc/NEWS3
3 files changed, 33 insertions, 1 deletions
diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py
index e9adaef..378a427 100755
--- a/Lib/test/test_urlparse.py
+++ b/Lib/test/test_urlparse.py
@@ -818,6 +818,35 @@ class UrlParseTestCase(unittest.TestCase):
p2 = urllib.parse.urlsplit('tel:+31641044153')
self.assertEqual(p2.scheme, 'tel')
self.assertEqual(p2.path, '+31641044153')
+ # assert the behavior for urlparse
+ p1 = urllib.parse.urlparse('tel:+31-641044153')
+ self.assertEqual(p1.scheme, 'tel')
+ self.assertEqual(p1.path, '+31-641044153')
+ p2 = urllib.parse.urlparse('tel:+31641044153')
+ self.assertEqual(p2.scheme, 'tel')
+ self.assertEqual(p2.path, '+31641044153')
+
+ def test_telurl_params(self):
+ p1 = urllib.parse.urlparse('tel:123-4;phone-context=+1-650-516')
+ self.assertEqual(p1.scheme, 'tel')
+ self.assertEqual(p1.path, '123-4')
+ self.assertEqual(p1.params, 'phone-context=+1-650-516')
+
+ p1 = urllib.parse.urlparse('tel:+1-201-555-0123')
+ self.assertEqual(p1.scheme, 'tel')
+ self.assertEqual(p1.path, '+1-201-555-0123')
+ self.assertEqual(p1.params, '')
+
+ p1 = urllib.parse.urlparse('tel:7042;phone-context=example.com')
+ self.assertEqual(p1.scheme, 'tel')
+ self.assertEqual(p1.path, '7042')
+ self.assertEqual(p1.params, 'phone-context=example.com')
+
+ p1 = urllib.parse.urlparse('tel:863-1234;phone-context=+1-914-555')
+ self.assertEqual(p1.scheme, 'tel')
+ self.assertEqual(p1.path, '863-1234')
+ self.assertEqual(p1.params, 'phone-context=+1-914-555')
+
def test_main():
support.run_unittest(UrlParseTestCase)
diff --git a/Lib/urllib/parse.py b/Lib/urllib/parse.py
index 4811759..dc75f8f 100644
--- a/Lib/urllib/parse.py
+++ b/Lib/urllib/parse.py
@@ -46,7 +46,7 @@ uses_netloc = ['ftp', 'http', 'gopher', 'nntp', 'telnet',
'svn', 'svn+ssh', 'sftp', 'nfs', 'git', 'git+ssh']
uses_params = ['ftp', 'hdl', 'prospero', 'http', 'imap',
'https', 'shttp', 'rtsp', 'rtspu', 'sip', 'sips',
- 'mms', '', 'sftp']
+ 'mms', '', 'sftp', 'tel']
# These are not actually used anymore, but should stay for backwards
# compatibility. (They are undocumented, but have a public-looking name.)
diff --git a/Misc/NEWS b/Misc/NEWS
index 0c4b8b2..a93024a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -182,6 +182,9 @@ Library
- Issue #16511: Use default IDLE width and height if config param is not valid.
Patch Serhiy Storchaka.
+- Issue #16713: Parsing of 'tel' urls using urlparse separates params from
+ path.
+
- Issue #16443: Add docstrings to regular expression match objects.
Patch by Anton Kasyanov.