merge from 3.2

orsenthil · orsenthil · commit 3242577a0875 · 2012-01-21T11:55:40.000+08:00
diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py
@@ -160,6 +160,9 @@ def test_iter(self):
         for line in self.returned_obj:
             self.assertEqual(line, self.text)
 
+    def test_relativelocalfile(self):
+        self.assertRaises(ValueError,urllib.request.urlopen,'./' + self.pathname)
+
 class ProxyTests(unittest.TestCase):
 
     def setUp(self):
diff --git a/Lib/test/test_urllib2net.py b/Lib/test/test_urllib2net.py
@@ -125,6 +125,8 @@ def test_file(self):
         finally:
             os.remove(TESTFN)
 
+        self.assertRaises(ValueError, urllib.request.urlopen,'./relative_path/to/file')
+
     # XXX Following test depends on machine configurations that are internal
     # to CNRI.  Need to set up a public server with the right authentication
     # configuration for test purposes.
diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
@@ -1813,6 +1813,8 @@ def open_local_file(self, url):
             urlfile = file
             if file[:1] == '/':
                 urlfile = 'file://' + file
+            elif file[:2] == './':
+                raise ValueError("local file url may start with / or file:. Unknown url of type: %s" % url)
             return addinfourl(open(localname, 'rb'), headers, urlfile)
         raise URLError('local file error', 'not on local host')
 
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -453,8 +453,7 @@ Core and Builtins
 Library
 -------
 
-- Issue #2134: A new attribute that specifies the exact type of token.OP
-  tokens has been added to tokenize.TokenInfo.
+- Issue #6631: Disallow relative file paths in urllib urlopen methods.
 
 - Issue #13722: Avoid silencing ImportErrors when initializing the codecs
   registry.
