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.
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 @@
req = Request("<URL:http://www.python.org>")
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 @@
def __init__(self, url, data=None, headers={},
origin_req_host=None, unverifiable=False):
# unwrap('<URL:type://host/path>') --> '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