[Python-checkins] r80954 - in python/branches/release26-maint: Lib/test/test_urllib2.py Lib/urllib2.py

[senthil.kumaran]

Author: senthil.kumaran
Date: Sat May  8 05:14:33 2010
New Revision: 80954

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


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/test/test_urllib2.py
   python/branches/release26-maint/Lib/urllib2.py

Modified: python/branches/release26-maint/Lib/test/test_urllib2.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_urllib2.py	(original)
+++ python/branches/release26-maint/Lib/test/test_urllib2.py	Sat May  8 05:14:33 2010
@@ -681,7 +681,7 @@
                 try:
                     data = r.read()
                     headers = r.info()
-                    newurl = r.geturl()
+                    respurl = r.geturl()
                 finally:
                     r.close()
                 stats = os.stat(TESTFN)
@@ -692,6 +692,7 @@
             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,

Modified: python/branches/release26-maint/Lib/urllib2.py
==============================================================================
--- python/branches/release26-maint/Lib/urllib2.py	(original)
+++ python/branches/release26-maint/Lib/urllib2.py	Sat May  8 05:14:33 2010
@@ -1288,7 +1288,7 @@
             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)