Merged revisions 83701 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r83701 | senthil.kumaran | 2010-08-04 10:20:44 +0530 (Wed, 04 Aug 2010) | 3 lines
Fix Issue754016 - urlparse goes wrong with IP:port without scheme
........
diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py
index b0c46f1..ec2df3c 100644
--- a/Lib/test/test_urlparse.py
+++ b/Lib/test/test_urlparse.py
@@ -424,6 +424,27 @@
self.assertEqual(urllib.parse.urlparse("http://example.com?blahblah=/foo"),
('http', 'example.com', '', '', 'blahblah=/foo', ''))
+ def test_withoutscheme(self):
+ # Test urlparse without scheme
+ # Issue 754016: urlparse goes wrong with IP:port without scheme
+ # RFC 1808 specifies that netloc should start with //, urlparse expects
+ # the same, otherwise it classifies the portion of url as path.
+ self.assertEqual(urllib.parse.urlparse("path"),
+ ('','','path','','',''))
+ self.assertEqual(urllib.parse.urlparse("//www.python.org:80"),
+ ('','www.python.org:80','','','',''))
+ self.assertEqual(urllib.parse.urlparse("http://www.python.org:80"),
+ ('http','www.python.org:80','','','',''))
+
+ def test_portseparator(self):
+ # Issue 754016 makes changes for port separator ':' from scheme separator
+ self.assertEqual(urllib.parse.urlparse("path:80"),
+ ('','','path:80','','',''))
+ self.assertEqual(urllib.parse.urlparse("http:"),('http','','','','',''))
+ self.assertEqual(urllib.parse.urlparse("https:"),('https','','','','',''))
+ self.assertEqual(urllib.parse.urlparse("http://www.python.org:80"),
+ ('http','www.python.org:80','','','',''))
+
def test_usingsys(self):
# Issue 3314: sys module is used in the error
self.assertRaises(TypeError, urllib.parse.urlencode, "foo")