mirror of https://github.com/python/cpython
Merged revisions 78268 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
This commit is contained in:
parent
a11865b8c6
commit
734f05925e
|
@ -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
|
||||
|
|
|
@ -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')
|
||||
|
|
Loading…
Reference in New Issue