Merge branch 'mgiuca-uri-cleanup-nonpath' into develop

AUTHORS.rst

@@ -81,3 +81,4 @@ Patches and Suggestions
 - Brendon Crawford
 - Denis (Telofy)
 - Cory Benfield (Lukasa)
+- Matt Giuca

requests/models.py

@@ -26,7 +26,7 @@ from .exceptions import (
     URLRequired, SSLError)
 from .utils import (
     get_encoding_from_headers, stream_decode_response_unicode,
-    stream_decompress, guess_filename, requote_path, dict_from_string)
+    stream_decompress, guess_filename, requote_uri, dict_from_string)
 
 from .compat import urlparse, urlunparse, urljoin, urlsplit, urlencode, quote, unquote, str, bytes, SimpleCookie, is_py3, is_py2
 
@@ -321,20 +321,30 @@ class Request(object):
             path = '/'
 
         if is_py2:
+            if isinstance(scheme, str):
+                scheme = scheme.encode('utf-8')
+            if isinstance(netloc, str):
+                netloc = netloc.encode('utf-8')
             if isinstance(path, str):
                 path = path.encode('utf-8')
-
-        path = requote_path(path)
+            if isinstance(params, str):
+                params = params.encode('utf-8')
+            if isinstance(query, str):
+                query = query.encode('utf-8')
+            if isinstance(fragment, str):
+                fragment = fragment.encode('utf-8')
 
         url = (urlunparse([ scheme, netloc, path, params, query, fragment ]))
 
         if self._enc_params:
             if urlparse(url).query:
-                return '%s&%s' % (url, self._enc_params)
+                url = '%s&%s' % (url, self._enc_params)
             else:
-                return '%s?%s' % (url, self._enc_params)
-        else:
-            return url
+                url = '%s?%s' % (url, self._enc_params)
+
+        url = requote_uri(url)
+
+        return url
 
     @property
     def path_url(self):

requests/utils.py

@@ -419,14 +419,14 @@ def unquote_unreserved(uri):
             parts[i] = '%' + parts[i]
     return ''.join(parts)
 
-def requote_path(path):
-    """Re-quote the given URL path component.
+def requote_uri(uri):
+    """Re-quote the given URI.
 
-    This function passes the given path through an unquote/quote cycle to
+    This function passes the given URI through an unquote/quote cycle to
     ensure that it is fully and consistently quoted.
     """
     # Unquote only the unreserved characters
     # Then quote only illegal characters (do not quote reserved, unreserved,
     # or '%')
-    return quote(unquote_unreserved(path), safe="!#$%&'()*+,/:;=?@[]~")
+    return quote(unquote_unreserved(uri), safe="!#$%&'()*+,/:;=?@[]~")
     return "/".join(parts)

test_requests.py

@@ -160,6 +160,29 @@ class RequestsTestSuite(TestSetup, unittest.TestCase):
         response = get(url)
         self.assertEqual(response.url, httpbin('get/' + path_unreserved))
 
+        # Re-run all of the same tests on the query part of the URI
+        query_fully_escaped = '%3Ca%25b%23c%2Fd%3E=%C3%98%20%C3%A5'
+        url = httpbin('get/?' + query_fully_escaped)
+        response = get(url)
+        self.assertEqual(response.url, httpbin('get/?' + query_fully_escaped))
+
+        query = u'<a%25b%23c%2Fd%3E=\u00d8 %C3%A5'
+        url = httpbin('get/?' + query)
+        response = get(url)
+        self.assertEqual(response.url, httpbin('get/?' + query_fully_escaped))
+
+        # The legal characters in query happens to be the same as in path
+        query_reserved = '!$&\'()*+,/:=@-._~'
+        url = httpbin('get/?' + query_reserved)
+        response = get(url)
+        self.assertEqual(response.url, httpbin('get/?' + query_reserved))
+
+        query_unreserved = 'ABCDwxyz=1234-._~'
+        query_unreserved_escaped = '%41%42%43%44%77%78%79%7A=%31%32%33%34%2D%2E%5F%7E'
+        url = httpbin('get/?' + query_unreserved_escaped)
+        response = get(url)
+        self.assertEqual(response.url, httpbin('get/?' + query_unreserved))
+
 
     def test_user_agent_transfers(self):
         """Issue XX"""