[Python-checkins] r78240 - in python/branches/release31-maint: Lib/test/test_urlparse.py

[ezio.melotti]

Author: ezio.melotti
Date: Fri Feb 19 15:51:06 2010
New Revision: 78240

Log:
Merged revisions 78239 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r78239 | ezio.melotti | 2010-02-19 16:49:02 +0200 (Fri, 19 Feb 2010) | 1 line
  
  urllib.urlparse -> urllib.parse.urlparse
........


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

Modified: python/branches/release31-maint/Lib/test/test_urlparse.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_urlparse.py	(original)
+++ python/branches/release31-maint/Lib/test/test_urlparse.py	Fri Feb 19 15:51:06 2010
@@ -142,7 +142,7 @@
                          (base, relurl, expected))
 
     def test_unparse_parse(self):
-        for u in ['Python', './Python','x-newscheme://foo.com/stuff']:
+        for u in ['Python', './Python', 'x-newscheme://foo.com/stuff']:
             self.assertEqual(urllib.parse.urlunsplit(urllib.parse.urlsplit(u)), u)
             self.assertEqual(urllib.parse.urlunparse(urllib.parse.urlparse(u)), u)
 
@@ -349,10 +349,10 @@
 
     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','','',''))
+        self.assertEqual(urllib.parse.urlparse("s3://foo.com/stuff"),
+                         ('s3', 'foo.com', '/stuff', '', '', ''))
+        self.assertEqual(urllib.parse.urlparse("x-newscheme://foo.com/stuff"),
+                         ('x-newscheme', 'foo.com', '/stuff', '', '', ''))
 
 def test_main():
     support.run_unittest(UrlParseTestCase)