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
........

diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py
index c911c9d2c074274248402882bfe470d9b4e527c6..3f781988f5a4f33cacf2166d19018f3b3d00a4ac 100644 (file)
--- 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 b416913f49292c274a52009295dc6eced82758a9..58ef6255874ba0d0235cc3045cc17041f9fcf06a 100644 (file)
--- 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)