fix problem with path being double escaped

diff --git a/requests/models.py b/requests/models.py
index 82c7572995a7e13eab2478f0a089b1b2f2259bab..c2cbe979184dfb74a49d178bbb8a252431f8a91b 100644 (file)
--- a/requests/models.py
+++ b/requests/models.py
@@ -351,8 +351,8 @@ class Request(object):
         if not path:
             path = '/'
 
-        # if is_py3:
-        path = quote(path.encode('utf-8'))
+        if is_py3:
+            path = quote(path.encode('utf-8'))
 
         url.append(path)
 

diff --git a/test_requests.py b/test_requests.py
index 034f469c5b959a2bd33c48156829357eab5df799..c3f3deb646ebac7d86e8478b224df974d2547cd1 100644 (file)
--- a/test_requests.py
+++ b/test_requests.py
@@ -72,6 +72,12 @@ class RequestsTestSuite(TestSetup, unittest.TestCase):
     def test_invalid_url(self):
         self.assertRaises(ValueError, get, 'hiwpefhipowhefopw')
 
+
+    def test_path_is_not_double_encoded(self):
+        request = requests.Request("http://0.0.0.0/get/~test")
+
+        assert request.path_url == "/get/%7Etest"
+
     def test_HTTP_200_OK_GET(self):
         r = get(httpbin('/get'))
         self.assertEqual(r.status_code, 200)