From 18d5a6966980387051e5c1012d9a87a46eda3d34 Mon Sep 17 00:00:00 2001 From: Senthil Kumaran Date: Sat, 20 Feb 2010 22:05:34 +0000 Subject: [PATCH] Fix for Issue7751: urllib.urlopen("///C|/foo/bar/spam.foo") --- Lib/test/test_urllib.py | 6 +++++- Lib/urllib.py | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py index 1d7fd7324e..1cf8e4487b 100644 --- a/Lib/test/test_urllib.py +++ b/Lib/test/test_urllib.py @@ -93,7 +93,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): @@ -607,6 +606,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. diff --git a/Lib/urllib.py b/Lib/urllib.py index d4740e97a7..58e750a5e2 100644 --- a/Lib/urllib.py +++ b/Lib/urllib.py @@ -179,7 +179,7 @@ class URLopener: fullurl = unwrap(toBytes(fullurl)) # percent encode url, fixing lame server errors for e.g, like space # within url paths. - 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') -- 2.50.1