]> granicus.if.org Git - python/commitdiff
Merged revisions 82780 via svnmerge from
authorSenthil Kumaran <orsenthil@gmail.com>
Sun, 11 Jul 2010 03:18:51 +0000 (03:18 +0000)
committerSenthil Kumaran <orsenthil@gmail.com>
Sun, 11 Jul 2010 03:18:51 +0000 (03:18 +0000)
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
Lib/urllib2.py

index b5a243705a206c27e1d962d2d114523b9c70ca15..23631f657fede157fbcad7efa6e6566da1ed6207 100644 (file)
@@ -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):
 
index 40e442751e0786ef2c3860238074fe5195121c11..f6f7be9092ae3ae99d9b2f8558785bf6117a4b5a 100644 (file)
@@ -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: