[Python-checkins] cpython (2.7): Fix the buildbot failure - msg164973

[senthil.kumaran]

http://hg.python.org/cpython/rev/7fe270af83ca
changeset:   77989:7fe270af83ca
branch:      2.7
parent:      77986:d931a3b64fd6
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Sun Jul 08 01:14:53 2012 -0700
summary:
  Fix the buildbot failure - msg164973

files:
  Lib/urllib2.py |  2 +-
  Misc/NEWS      |  7 +++----
  2 files changed, 4 insertions(+), 5 deletions(-)


diff --git a/Lib/urllib2.py b/Lib/urllib2.py
--- a/Lib/urllib2.py
+++ b/Lib/urllib2.py
@@ -196,7 +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 = 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
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -84,10 +84,9 @@
 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.

-- 
Repository URL: http://hg.python.org/cpython