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.
........
................
diff --git a/Lib/urllib2.py b/Lib/urllib2.py
index 7cfbc1f..ca74c9f 100644
--- a/Lib/urllib2.py
+++ b/Lib/urllib2.py
@@ -1259,7 +1259,8 @@
# 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: