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
........
This commit is contained in:
Senthil Kumaran 2010-05-08 03:14:33 +00:00
parent 6d54b0178b
commit 2add184b2d
2 changed files with 3 additions and 2 deletions

View file

@ -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)