Merge pull request #62 from Kinto/fix-get-parameters

Don't send data on GET requests.

Author: almet

kinto_client/session.py

@@ -61,7 +61,7 @@ def request(self, method, endpoint, data=None, permissions=None,
             if hasattr(permissions, 'as_dict'):
                 permissions = permissions.as_dict()
             payload['permissions'] = permissions
-        if payload:
+        if payload and method not in ('get', 'head'):
             payload_kwarg = 'data' if 'files' in kwargs else 'json'
             kwargs.setdefault(payload_kwarg, payload)
 

kinto_client/tests/test_session.py

@@ -24,8 +24,7 @@ def test_no_auth_is_used_by_default(self):
         self.assertEquals(session.auth, None)
         session.request('get', '/test')
         self.requests_mock.request.assert_called_with(
-            'get', 'https://example.org/test',
-            json={'data': {}})
+            'get', 'https://example.org/test')
 
     def test_bad_http_status_raises_exception(self):
         response = mock.MagicMock()
@@ -44,8 +43,7 @@ def test_session_injects_auth_on_requests(self):
         session.request('get', '/test')
         self.requests_mock.request.assert_called_with(
             'get', 'https://example.org/test',
-            auth=mock.sentinel.auth,
-            json={"data": {}})
+            auth=mock.sentinel.auth)
 
     def test_requests_arguments_are_forwarded(self):
         response = mock.MagicMock()
@@ -56,18 +54,17 @@ def test_requests_arguments_are_forwarded(self):
                         foo=mock.sentinel.bar)
         self.requests_mock.request.assert_called_with(
             'get', 'https://example.org/test',
-            foo=mock.sentinel.bar,
-            json={"data": {}})
+            foo=mock.sentinel.bar)
 
     def test_passed_data_is_encoded_to_json(self):
         response = mock.MagicMock()
         response.status_code = 200
         self.requests_mock.request.return_value = response
         session = Session('https://example.org')
-        session.request('get', '/test',
+        session.request('post', '/test',
                         data={'foo': 'bar'})
         self.requests_mock.request.assert_called_with(
-            'get', 'https://example.org/test',
+            'post', 'https://example.org/test',
             json={"data": {'foo': 'bar'}})
 
     def test_passed_data_is_passed_as_is_when_files_are_posted(self):
@@ -90,10 +87,10 @@ def test_passed_permissions_is_added_in_the_payload(self):
         session = Session('https://example.org')
         permissions = mock.MagicMock()
         permissions.as_dict.return_value = {'foo': 'bar'}
-        session.request('get', '/test',
+        session.request('post', '/test',
                         permissions=permissions)
         self.requests_mock.request.assert_called_with(
-            'get', 'https://example.org/test',
+            'post', 'https://example.org/test',
             json={'data': {}, 'permissions': {'foo': 'bar'}})
 
     def test_url_is_used_if_schema_is_present(self):
@@ -105,8 +102,7 @@ def test_url_is_used_if_schema_is_present(self):
         permissions.as_dict.return_value = {'foo': 'bar'}
         session.request('get', 'https://example.org/anothertest')
         self.requests_mock.request.assert_called_with(
-            'get', 'https://example.org/anothertest',
-            json={"data": {}})
+            'get', 'https://example.org/anothertest')
 
     def test_creation_fails_if_session_and_server_url(self):
         self.assertRaises(
@@ -142,6 +138,25 @@ def test_body_is_none_on_304(self):
         body, headers = session.request('get', 'https://example.org/test')
         assert body is None
 
+    def test_no_payload_is_sent_on_get_requests(self):
+        response = mock.MagicMock()
+        response.status_code = 200
+        self.requests_mock.request.return_value = response
+        session = Session('https://example.org')
+        session.request('get', 'https://example.org/anothertest')
+        self.requests_mock.request.assert_called_with(
+            'get', 'https://example.org/anothertest')
+
+    def test_payload_is_sent_on_put_requests(self):
+        response = mock.MagicMock()
+        response.status_code = 200
+        self.requests_mock.request.return_value = response
+        session = Session('https://example.org')
+        session.request('put', 'https://example.org/anothertest')
+        self.requests_mock.request.assert_called_with(
+            'put', 'https://example.org/anothertest',
+            json={'data': {}})
+
 
 class RetryRequestTest(unittest.TestCase):