Fix issue14826 - make urllib.request.Request quoted url consistent with URLOpener open method.
Patch contributed by Stephen Thorne.
diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py
index c6f6f61..69d5438 100644
--- a/Lib/test/test_urllib.py
+++ b/Lib/test/test_urllib.py
@@ -1246,6 +1246,11 @@
# ftp.close()
+ def test_quote_url(self):
+ Request = urllib.request.Request
+ request = Request("http://www.python.org/foo bar")
+ self.assertEqual(request.full_url, "http://www.python.org/foo%20bar")
+
def test_main():
support.run_unittest(
diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
index d6f9f9a..796b700 100644
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -180,7 +180,8 @@
def __init__(self, url, data=None, headers={},
origin_req_host=None, unverifiable=False):
# unwrap('<URL:type://host/path>') --> 'type://host/path'
- self.full_url = unwrap(url)
+ self.full_url = unwrap(to_bytes(url))
+ self.full_url = quote(self.full_url, safe="%/:=&?~#+!$,;'@()*[]|")
self.full_url, self.fragment = splittag(self.full_url)
self.data = data
self.headers = {}
diff --git a/Misc/NEWS b/Misc/NEWS
index 92131b4..18d03ef 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -87,6 +87,11 @@
Library
-------
+- Issue #14826: Quote urls in urllib.request.Request identically to how they
+ are quoted by urllib.request.URLopener. Allows urls to spaces in them to work
+ transparently with urllib.request.urlopen(...). Patch contributed by Stephen
+ Thorne.
+
- Issue #14990: Correctly fail with SyntaxError on invalid encoding
declaration.