Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 82782 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/branches/release27-maint

................
  r82782 | senthil.kumaran | 2010-07-11 08:48:51 +0530 (Sun, 11 Jul 2010) | 9 lines

  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.
  ........
................
This commit is contained in:
Senthil Kumaran 2010-07-11 03:33:38 +00:00
parent f5d9570f85
commit 9d3c5c8a4c
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Lib/test/test_urllib2.py
View File

@ -728,6 +728,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:
@ -738,6 +740,7 @@ class HandlerTests(unittest.TestCase):
else:
self.assert_(o.req is req)
self.assertEqual(req.type, "ftp")
self.assertEqual(req.type is "ftp", ftp)
def test_http(self):

3
Lib/urllib2.py
View File

@ -1259,7 +1259,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: