traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Lib/test/test_urllib2.py
View File

@ -689,7 +689,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)
@ -700,6 +700,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,

3
Lib/urllib/request.py
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)