From 2add184b2d84a802593c1230e80a2b6766291db1 Mon Sep 17 00:00:00 2001 From: Senthil Kumaran Date: Sat, 8 May 2010 03:14:33 +0000 Subject: 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 ........ --- Lib/test/test_urllib2.py | 3 ++- Lib/urllib2.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py index c911c9d..3f78198 100644 --- a/Lib/test/test_urllib2.py +++ b/Lib/test/test_urllib2.py @@ -681,7 +681,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) @@ -692,6 +692,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, diff --git a/Lib/urllib2.py b/Lib/urllib2.py index b416913..58ef625 100644 --- a/Lib/urllib2.py +++ b/Lib/urllib2.py @@ -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) -- cgit v0.12