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

Fix Issue8656 - urllib2 mangles file://-scheme URLs

This commit is contained in:
Senthil Kumaran 2010-05-08 03:11:50 +00:00
parent badc709847
commit 6057ba1f97
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Lib/test/test_urllib2.py
View File

@ -679,7 +679,7 @@ class HandlerTests(unittest.TestCase):
try:
data = r.read()
headers = r.info()
newurl = r.geturl()
respurl = r.geturl()
finally:
r.close()
stats = os.stat(TESTFN)
@ -690,6 +690,7 @@ class HandlerTests(unittest.TestCase):
self.assertEqual(headers["Content-type"], "text/plain")
self.assertEqual(headers["Content-length"], "13")
self.assertEqual(headers["Last-modified"], modified)
self.assertEqual(respurl, url)
for url in [
"file://localhost:80%s" % urlpath,

2
Lib/urllib2.py
View File

@ -1291,7 +1291,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)