From 3402414b850938a55af78fd79d7890c935dca630 Mon Sep 17 00:00:00 2001 From: Senthil Kumaran Date: Sun, 11 Jul 2010 03:15:25 +0000 Subject: 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. ........ --- Lib/test/test_urllib2.py | 3 +++ Lib/urllib/request.py | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py index 9071f49..9d1ed9b 100644 --- a/Lib/test/test_urllib2.py +++ b/Lib/test/test_urllib2.py @@ -736,6 +736,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: @@ -746,6 +748,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/urllib/request.py b/Lib/urllib/request.py index e59208f..cb80a36 100644 --- a/Lib/urllib/request.py +++ b/Lib/urllib/request.py @@ -1188,7 +1188,8 @@ class FileHandler(BaseHandler): # Use local file or FTP depending on form of URL def file_open(self, req): url = req.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: -- cgit v0.12