Merged revisions 78234 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78234 | senthil.kumaran | 2010-02-19 13:02:48 +0530 (Fri, 19 Feb 2010) | 2 lines
Fix for Issue7904. urlparse.urlsplit to handle schemes in the way defined by RFC3986
........
diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py
index fcd1989..0f306a9 100644
--- a/Lib/test/test_urlparse.py
+++ b/Lib/test/test_urlparse.py
@@ -138,7 +138,7 @@
(base, relurl, expected))
def test_unparse_parse(self):
- for u in ['Python', './Python']:
+ for u in ['Python', './Python','x-newscheme://foo.com/stuff']:
self.assertEqual(urlparse.urlunsplit(urlparse.urlsplit(u)), u)
self.assertEqual(urlparse.urlunparse(urlparse.urlparse(u)), u)
@@ -350,6 +350,15 @@
self.assertEqual(urlparse.urlparse("http://example.com?blahblah=/foo"),
('http', 'example.com', '', '', 'blahblah=/foo', ''))
+ def test_anyscheme(self):
+ # Issue 7904: s3://foo.com/stuff has netloc "foo.com".
+ self.assertEqual(urlparse.urlparse("s3://foo.com/stuff"),
+ ('s3','foo.com','/stuff','','',''))
+ self.assertEqual(urlparse.urlparse("x-newscheme://foo.com/stuff"),
+ ('x-newscheme','foo.com','/stuff','','',''))
+
+
+
def test_main():
test_support.run_unittest(UrlParseTestCase)