summaryrefslogtreecommitdiffstats
path: root/Lib/urllib2.py
diff options
context:
space:
mode:
authorSenthil Kumaran <orsenthil@gmail.com>2010-05-08 03:14:33 (GMT)
committerSenthil Kumaran <orsenthil@gmail.com>2010-05-08 03:14:33 (GMT)
commit2add184b2d84a802593c1230e80a2b6766291db1 (patch)
tree14555f114c533c22293a1f28db3aca6e9da2ef6c /Lib/urllib2.py
parent6d54b0178b0061ff203e41ff9d746e5f0d2bc060 (diff)
downloadcpython-2add184b2d84a802593c1230e80a2b6766291db1.zip
cpython-2add184b2d84a802593c1230e80a2b6766291db1.tar.gz
cpython-2add184b2d84a802593c1230e80a2b6766291db1.tar.bz2
Merged revisions 80953 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r80953 | senthil.kumaran | 2010-05-08 08:41:50 +0530 (Sat, 08 May 2010) | 3 lines Fix Issue8656 - urllib2 mangles file://-scheme URLs ........
Diffstat (limited to 'Lib/urllib2.py')
-rw-r--r--Lib/urllib2.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/urllib2.py b/Lib/urllib2.py
index b416913..58ef625 100644
--- a/Lib/urllib2.py
+++ b/Lib/urllib2.py
@@ -1288,7 +1288,7 @@ class FileHandler(BaseHandler):
if not host or \
(not port and socket.gethostbyname(host) in self.get_names()):
return addinfourl(open(localfile, 'rb'),
- headers, 'file:'+file)
+ headers, 'file://'+ host + file)
except OSError, msg:
# urllib2 users shouldn't expect OSErrors coming from urlopen()
raise URLError(msg)