From 0e7e9aee59809762f929df04c638bf01ebd0ed4d Mon Sep 17 00:00:00 2001 From: Senthil Kumaran Date: Sat, 20 Feb 2010 22:30:21 +0000 Subject: [PATCH] Merged revisions 78270 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r78270 | senthil.kumaran | 2010-02-21 03:49:04 +0530 (Sun, 21 Feb 2010) | 4 lines Merged revisions 78268 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ --- Lib/test/test_urllib.py | 6 +++++- Lib/urllib/request.py | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py index ad0c1000034..f4b3766375c 100644 --- a/Lib/test/test_urllib.py +++ b/Lib/test/test_urllib.py @@ -113,7 +113,6 @@ class urlopen_FileTests(unittest.TestCase): for line in self.returned_obj.__iter__(): self.assertEqual(line, self.text) - class ProxyTests(unittest.TestCase): def setUp(self): @@ -868,6 +867,11 @@ class URLopener_Tests(unittest.TestCase): 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 index 8229764d7a1..9e02962a020 100644 --- a/Lib/urllib/request.py +++ b/Lib/urllib/request.py @@ -1426,7 +1426,7 @@ class URLopener: 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')