mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-19 16:20:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merged revisions 80953 via svnmerge from

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

3
Lib/test/test_urllib2.py
View file

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

2
Lib/urllib2.py
View file

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