summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2012-07-08 08:14:53 (GMT)
committerSenthil Kumaran <senthil@uthcode.com>2012-07-08 08:14:53 (GMT)
commitdc43adbfc2e23f88a5587660a824fad65aec15fc (patch)
tree12dcac08a710cdc379c5c12a13de9f6bb62152d9
parent01fe5fa8ea52ba49063d20a5044fb84efdbabe48 (diff)
downloadcpython-dc43adbfc2e23f88a5587660a824fad65aec15fc.zip
cpython-dc43adbfc2e23f88a5587660a824fad65aec15fc.tar.gz
cpython-dc43adbfc2e23f88a5587660a824fad65aec15fc.tar.bz2
Fix the buildbot failure - msg164973
-rw-r--r--Lib/urllib2.py2
-rw-r--r--Misc/NEWS7
2 files changed, 4 insertions, 5 deletions
diff --git a/Lib/urllib2.py b/Lib/urllib2.py
index 944f622..02d77d7 100644
--- 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 7e6dadd..8a10572 100644
--- 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.