Fix issue14826 - make urllib.request.Request quoted url consistent with URLOpener open method.

Patch contributed by Stephen Thorne.

3 files changed, 12 insertions, 1 deletions

diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py
index 22ada56d0c..af3f0ad3ae 100644
--- a/Lib/test/test_urllib.py
+++ b/Lib/test/test_urllib.py
@@ -1272,6 +1272,11 @@ class RequestTests(unittest.TestCase):
         request.method = 'HEAD'
         self.assertEqual(request.get_method(), 'HEAD')
 
+    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 67b4c795b3..3896aa0ecf 100644
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -263,7 +263,8 @@ class Request:
                  origin_req_host=None, unverifiable=False,
                  method=None):
         # 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 0e43c5f055..c0d1d0115b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -23,6 +23,11 @@ Core and Builtins
 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 #5931: wsgiref environ variable SERVER_SOFTWARE will specify an
   implementation specific term like Cpython, Jython instead of generic "Python"