Commit 734f0592 authored by Senthil Kumaran's avatar Senthil Kumaran

Merged revisions 78268 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk
parent a11865b8
...@@ -112,7 +112,6 @@ class urlopen_FileTests(unittest.TestCase): ...@@ -112,7 +112,6 @@ class urlopen_FileTests(unittest.TestCase):
for line in self.returned_obj.__iter__(): for line in self.returned_obj.__iter__():
self.assertEqual(line, self.text) self.assertEqual(line, self.text)
class ProxyTests(unittest.TestCase): class ProxyTests(unittest.TestCase):
def setUp(self): def setUp(self):
...@@ -866,6 +865,11 @@ class URLopener_Tests(unittest.TestCase): ...@@ -866,6 +865,11 @@ class URLopener_Tests(unittest.TestCase):
self.assertEqual(DummyURLopener().open( self.assertEqual(DummyURLopener().open(
'spam://example/ /'),'//example/%20/') '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. # Just commented them out.
# Can't really tell why keep failing in windows and sparc. # Can't really tell why keep failing in windows and sparc.
# Everywhere else they work ok, but on those machines, someteimes # Everywhere else they work ok, but on those machines, someteimes
......
...@@ -1426,7 +1426,7 @@ class URLopener: ...@@ -1426,7 +1426,7 @@ class URLopener:
def open(self, fullurl, data=None): def open(self, fullurl, data=None):
"""Use URLopener().open(file) instead of open(file, 'r').""" """Use URLopener().open(file) instead of open(file, 'r')."""
fullurl = unwrap(to_bytes(fullurl)) fullurl = unwrap(to_bytes(fullurl))
fullurl = quote(fullurl, safe="%/:=&?~#+!$,;'@()*[]") fullurl = quote(fullurl, safe="%/:=&?~#+!$,;'@()*[]|")
if self.tempcache and fullurl in self.tempcache: if self.tempcache and fullurl in self.tempcache:
filename, headers = self.tempcache[fullurl] filename, headers = self.tempcache[fullurl]
fp = open(filename, 'rb') fp = open(filename, 'rb')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment