Merge pull request tindie#5 from jdorweiler/master

pass params in data

pydiscourse/client.py

@@ -793,7 +793,7 @@ def _get(self, path, **kwargs):
         Returns:
 
         """
-        return self._request(GET, path, kwargs)
+        return self._request(GET, path, params=kwargs)
 
     def _put(self, path, **kwargs):
         """
@@ -805,7 +805,7 @@ def _put(self, path, **kwargs):
         Returns:
 
         """
-        return self._request(PUT, path, kwargs)
+        return self._request(PUT, path, data=kwargs)
 
     def _post(self, path, **kwargs):
         """
@@ -817,7 +817,7 @@ def _post(self, path, **kwargs):
         Returns:
 
         """
-        return self._request(POST, path, kwargs)
+        return self._request(POST, path, data=kwargs)
 
     def _delete(self, path, **kwargs):
         """
@@ -829,9 +829,9 @@ def _delete(self, path, **kwargs):
         Returns:
 
         """
-        return self._request(DELETE, path, kwargs)
+        return self._request(DELETE, path, params=kwargs)
 
-    def _request(self, verb, path, params):
+    def _request(self, verb, path, params={}, data={}):
         """
         Executes HTTP request to API and handles response
 
@@ -851,7 +851,7 @@ def _request(self, verb, path, params):
         headers = {'Accept': 'application/json; charset=utf-8'}
 
         response = requests.request(
-            verb, url, allow_redirects=False, params=params, headers=headers,
+            verb, url, allow_redirects=False, params=params, data=data, headers=headers,
             timeout=self.timeout)
 
         log.debug('response %s: %s', response.status_code, repr(response.text))

tests/test_client.py

@@ -42,7 +42,9 @@ def assertRequestCalled(self, request, verb, url, **params):
         kwargs = kwargs['params']
         self.assertEqual(kwargs.pop('api_username'), self.api_username)
         self.assertEqual(kwargs.pop('api_key'), self.api_key)
-        self.assertEqual(kwargs, params)
+
+        if verb == 'GET':
+            self.assertEqual(kwargs, params)
 
 
 
@@ -189,4 +191,4 @@ def test_badges(self, request):
     def test_grant_badge_to(self, request):
         prepare_response(request)
         self.client.grant_badge_to('username', 1)
-        self.assertRequestCalled(request, 'POST', '/user_badges', username='username', badge_id=1)
+        self.assertRequestCalled(request, 'POST', '/user_badges', username='username', badge_id=1)