Fix the buildbot failure - msg164973

diff --git a/Lib/urllib2.py b/Lib/urllib2.py
index 944f6223b84d656b5efd285845fbdc9e16a1b4ad..02d77d73f9a4ba1c7148b2da59f6293ca7543734 100644 (file)
--- a/Lib/urllib2.py
+++ b/Lib/urllib2.py
@@ -196,7 +196,7 @@ class Request:
     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 = unwrap(url)
         self.__original = quote(self.__original, safe="%/:=&?~#+!$,;'@()*[]|")
         self.__original, self.__fragment = splittag(self.__original)
         self.type = None

diff --git a/Misc/NEWS b/Misc/NEWS
index 7e6dadd73ac18bb982f118c6dff457b3517c84b5..8a10572cb750ea24e6930d0b9472c4d721895718 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -84,10 +84,9 @@ 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 #14826: Quote urls in urllib2.Request similar 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.