From: Senthil Kumaran Date: Sun, 11 Jul 2010 03:18:51 +0000 (+0000) Subject: Merged revisions 82780 via svnmerge from X-Git-Tag: v2.7.1rc1~617 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=87ed31a4142f3c0adaf8acdcef8bf059e75293d0;p=python Merged revisions 82780 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r82780 | senthil.kumaran | 2010-07-11 08:42:43 +0530 (Sun, 11 Jul 2010) | 3 lines Stricter verification for file based url scheme and reliance on ftp protocol. ........ --- diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py index b5a243705a..23631f657f 100644 --- a/Lib/test/test_urllib2.py +++ b/Lib/test/test_urllib2.py @@ -726,6 +726,8 @@ class HandlerTests(unittest.TestCase): ("file://ftp.example.com///foo.txt", False), # XXXX bug: fails with OSError, should be URLError ("file://ftp.example.com/foo.txt", False), + ("file://somehost//foo/something.txt", True), + ("file://localhost//foo/something.txt", False), ]: req = Request(url) try: @@ -736,6 +738,7 @@ class HandlerTests(unittest.TestCase): else: self.assertTrue(o.req is req) self.assertEqual(req.type, "ftp") + self.assertEqual(req.type is "ftp", ftp) def test_http(self): diff --git a/Lib/urllib2.py b/Lib/urllib2.py index 40e442751e..f6f7be9092 100644 --- a/Lib/urllib2.py +++ b/Lib/urllib2.py @@ -1262,7 +1262,8 @@ class FileHandler(BaseHandler): # Use local file or FTP depending on form of URL def file_open(self, req): url = req.get_selector() - if url[:2] == '//' and url[2:3] != '/': + if url[:2] == '//' and url[2:3] != '/' and (req.host and + req.host != 'localhost'): req.type = 'ftp' return self.parent.open(req) else: