Merged revisions 78268 via svnmerge from

orsenthil · orsenthil · commit 734f05925ef5 · 2010-02-20T22:19:04.000Z
svn+ssh://pythondev@svn.python.org/python/trunk
diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py
@@ -112,7 +112,6 @@ def test_iter(self):
         for line in self.returned_obj.__iter__():
             self.assertEqual(line, self.text)
 
-
 class ProxyTests(unittest.TestCase):
 
     def setUp(self):
@@ -866,6 +865,11 @@ def open_spam(self, url):
         self.assertEqual(DummyURLopener().open(
             'spam://example/ /'),'//example/%20/')
 
+        # test the safe characters are not quoted by urlopen
+        self.assertEqual(DummyURLopener().open(
+            "spam://c:|windows%/:=&?~#+!$,;'@()*[]|/path/"),
+            "//c:|windows%/:=&?~#+!$,;'@()*[]|/path/")
+
 # Just commented them out.
 # Can't really tell why keep failing in windows and sparc.
 # Everywhere else they work ok, but on those machines, someteimes
diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
@@ -1426,7 +1426,7 @@ def addheader(self, *args):
     def open(self, fullurl, data=None):
         """Use URLopener().open(file) instead of open(file, 'r')."""
         fullurl = unwrap(to_bytes(fullurl))
-        fullurl = quote(fullurl, safe="%/:=&?~#+!$,;'@()*[]")
+        fullurl = quote(fullurl, safe="%/:=&?~#+!$,;'@()*[]|")
         if self.tempcache and fullurl in self.tempcache:
             filename, headers = self.tempcache[fullurl]
             fp = open(filename, 'rb')
