diff options
| author | Senthil Kumaran <orsenthil@gmail.com> | 2010-02-20 22:19:04 (GMT) |
|---|---|---|
| committer | Senthil Kumaran <orsenthil@gmail.com> | 2010-02-20 22:19:04 (GMT) |
| commit | 734f05925ef57e34e13efd501a47556a98ea3085 (patch) | |
| tree | ad8b05aae61a0a9f5bfdeff7ed0f49dcb248a276 | |
| parent | a11865b8c6dff87bc18b23cded2ea554dd190bb7 (diff) | |
| download | cpython-734f05925ef57e34e13efd501a47556a98ea3085.zip cpython-734f05925ef57e34e13efd501a47556a98ea3085.tar.gz cpython-734f05925ef57e34e13efd501a47556a98ea3085.tar.bz2 | |
Merged revisions 78268 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
| -rw-r--r-- | Lib/test/test_urllib.py | 6 | ||||
| -rw-r--r-- | 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 02d08d4..597678d 100644 --- a/Lib/test/test_urllib.py +++ b/Lib/test/test_urllib.py @@ -112,7 +112,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): @@ -866,6 +865,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 9332aa5..07a7ee6 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') |