Moves logic to Request initializer

Author: 0bsearch

python_http_client/client.py

@@ -104,7 +104,7 @@ def _build_versioned_url(self, url):
         :type url: string
         :return: string
         """
-        return '{0}/v{1}{2}'.format(self.host, str(self._version), url)
+        return '{0}/v{1}{2}'.format(self.host, self._version, url)
 
     def _build_url(self, query_params):
         """Build the final URL to be passed to urllib
@@ -213,44 +213,50 @@ def get_version(*args, **kwargs):
         if name in self.methods:
             method = name.upper()
 
-            def http_request(*_, **kwargs):
+            def http_request(
+                    request_body=None,
+                    query_params=None,
+                    request_headers=None,
+                    timeout=None,
+                    **_):
                 """Make the API call
-                :param args: unused
+                :param timeout: HTTP request timeout. Will be propagated to
+                    urllib client
+                :type timeout: float
+                :param request_headers: HTTP headers. Will be merged into
+                    current client object state
+                :type request_headers: dict
+                :param query_params: HTTP query parameters
+                :type query_params: dict
+                :param request_body: HTTP request body
+                :type request_body: string or json-serializable object
                 :param kwargs:
-                :return: Client object
+                :return: Response object
                 """
-                if 'request_headers' in kwargs:
-                    self._update_headers(kwargs['request_headers'])
-                if 'request_body' not in kwargs:
+                if request_headers:
+                    self._update_headers(request_headers)
+
+                if request_body is None:
                     data = None
                 else:
                     # Don't serialize to a JSON formatted str
                     # if we don't have a JSON Content-Type
-                    if 'Content-Type' in self.request_headers:
-                        if self.request_headers['Content-Type'] != 'application\
-                        /json':
-                            data = kwargs['request_body'].encode('utf-8')
-                        else:
-                            data = json.dumps(
-                                kwargs['request_body']).encode('utf-8')
+                    if 'Content-Type' in self.request_headers and \
+                            self.request_headers['Content-Type'] != 'application/json':
+                        data = request_body.encode('utf-8')
                     else:
-                        data = json.dumps(
-                            kwargs['request_body']).encode('utf-8')
-
-                if 'query_params' in kwargs:
-                    params = kwargs['query_params']
-                else:
-                    params = None
+                        self.request_headers.setdefault(
+                            'Content-Type', 'application/json')
+                        data = json.dumps(request_body).encode('utf-8')
 
                 opener = urllib.build_opener()
-                request = urllib.Request(self._build_url(params), data=data)
-                if self.request_headers:
-                    for key, value in self.request_headers.items():
-                        request.add_header(key, value)
-                if data and ('Content-Type' not in self.request_headers):
-                    request.add_header('Content-Type', 'application/json')
+                request = urllib.Request(
+                    self._build_url(query_params),
+                    headers=self.request_headers,
+                    data=data,
+                )
                 request.get_method = lambda: method
-                timeout = kwargs.pop('timeout', None)
+
                 return Response(self._make_request(opener, request, timeout=timeout))
             return http_request
         else:

tests/test_unit.py

@@ -4,6 +4,12 @@
     import unittest2 as unittest
 except ImportError:
     import unittest
+
+try:
+    import mock
+except ImportError:
+    from unittest import mock
+
 from python_http_client.client import Client
 from python_http_client.exceptions import (
     handle_error,
@@ -123,6 +129,19 @@ def test__build_url(self):
         built_url = self.client._build_url(query_params)
         self.assertEqual(built_url, url)
 
+    @mock.patch('python_http_client.client.Client._make_request')
+    def test__urllib_headers(self, maker):
+        self.client._update_headers({'X-test': 'Test'})
+        self.client.get()
+        request = maker.call_args[0][1]
+        self.assertTrue('X-test' in request.headers)
+
+    @mock.patch('python_http_client.client.Client._make_request')
+    def test__urllib_method(self, maker):
+        self.client.delete()
+        request = maker.call_args[0][1]
+        self.assertEqual(request.get_method(), 'DELETE')
+
     def test__update_headers(self):
         request_headers = {'X-Test': 'Test'}
         self.client._update_headers(request_headers)