[Python-checkins] r78235 - in python/branches/release26-maint: Lib/test/test_urlparse.py Lib/urlparse.py

[senthil.kumaran]

Author: senthil.kumaran
Date: Fri Feb 19 08:39:41 2010
New Revision: 78235

Log:
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
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/test/test_urlparse.py
   python/branches/release26-maint/Lib/urlparse.py

Modified: python/branches/release26-maint/Lib/test/test_urlparse.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_urlparse.py	(original)
+++ python/branches/release26-maint/Lib/test/test_urlparse.py	Fri Feb 19 08:39:41 2010
@@ -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)
 

Modified: python/branches/release26-maint/Lib/urlparse.py
==============================================================================
--- python/branches/release26-maint/Lib/urlparse.py	(original)
+++ python/branches/release26-maint/Lib/urlparse.py	Fri Feb 19 08:39:41 2010
@@ -163,7 +163,8 @@
                 break
         else:
             scheme, url = url[:i].lower(), url[i+1:]
-    if scheme in uses_netloc and url[:2] == '//':
+
+    if url[:2] == '//':
         netloc, url = _splitnetloc(url, 2)
     if allow_fragments and scheme in uses_fragment and '#' in url:
         url, fragment = url.split('#', 1)