From 9603428755a644c01ebfd356e2f90864291a26a8 Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Fri, 19 Feb 2010 14:51:06 +0000 Subject: [PATCH] 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 ........ --- Lib/test/test_urlparse.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py index 08145cb30c5..16584118459 100644 --- a/Lib/test/test_urlparse.py +++ b/Lib/test/test_urlparse.py @@ -142,7 +142,7 @@ class UrlParseTestCase(unittest.TestCase): (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 @@ class UrlParseTestCase(unittest.TestCase): 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)