Merged revisions 80955 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80955 | senthil.kumaran | 2010-05-08 08:59:09 +0530 (Sat, 08 May 2010) | 9 lines

  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:31:56 +00:00
parent adfe27a717
commit 51964772b7
2 changed files with 4 additions and 2 deletions

View file

@ -1216,7 +1216,8 @@ class FileHandler(BaseHandler):
host, port = splitport(host)
if not host or \
(not port and _safe_gethostbyname(host) in self.get_names()):
return addinfourl(open(localfile, 'rb'), headers, 'file:'+file)
return addinfourl(open(localfile, 'rb'), headers, 'file://'+
host + file)
except OSError as msg:
# users shouldn't expect OSErrors coming from urlopen()
raise URLError(msg)