From 5d60e56a1744066c0c1e05639e098f148fb29ba8 Mon Sep 17 00:00:00 2001 From: Senthil Kumaran Date: Sun, 8 Jul 2012 02:20:27 -0700 Subject: revert the changes done in d931a3b64fd6 - buildbot failure. The fix for issue14826 might need to address toBytes and test_url_encoding in test_cookielib.py before it is brought back in. --- Lib/test/test_urllib2.py | 6 ------ Lib/urllib2.py | 3 +-- Misc/NEWS | 5 ----- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py index dd5ff8d8..fc76a6c 100644 --- a/Lib/test/test_urllib2.py +++ b/Lib/test/test_urllib2.py @@ -1325,12 +1325,6 @@ class RequestTests(unittest.TestCase): req = Request("") self.assertEqual("www.python.org", req.get_host()) - def test_quoted_full_url(self): - Request = urllib2.Request - request = Request('http://www.python.org/foo bar') - self.assertEqual(request.get_full_url(), - 'http://www.python.org/foo%20bar') - def test_url_fragment(self): req = Request("http://www.python.org/?qs=query#fragment=true") self.assertEqual("/?qs=query", req.get_selector()) diff --git a/Lib/urllib2.py b/Lib/urllib2.py index 944f622..ebf5811 100644 --- a/Lib/urllib2.py +++ b/Lib/urllib2.py @@ -196,8 +196,7 @@ class Request: def __init__(self, url, data=None, headers={}, origin_req_host=None, unverifiable=False): # unwrap('') --> 'type://host/path' - self.__original = unwrap(toBytes(url)) - self.__original = quote(self.__original, safe="%/:=&?~#+!$,;'@()*[]|") + self.__original = unwrap(url) self.__original, self.__fragment = splittag(self.__original) self.type = None # self.__r_type is what's left after doing the splittype diff --git a/Misc/NEWS b/Misc/NEWS index 7e6dadd..c5e2e92 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -84,11 +84,6 @@ Core and Builtins Library ------- -- Issue #14826: Quote urls in urllib2.Request identically to how they - are quoted by urllib.URLopener. Allows urls to spaces in them to work - transparently with urllib.request.urlopen(...). Patch contributed by Stephen - Thorne. - - Issue #15247: FileIO now raises an error when given a file descriptor pointing to a directory. -- cgit v0.12