Merge pull request #13 from alphagov/tidy-up-utils-problems

Tidy up utils problems
Crown-Commercial-Service · May 1, 2015 · 871a4c0 · 871a4c0
2 parents 6a47299 + 0090b7f
commit 871a4c0
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 20 deletions.
diff --git a/dmutils/__init__.py b/dmutils/__init__.py
@@ -1 +1 @@
-__version__ = '0.4.0'
+__version__ = '0.4.1'
diff --git a/dmutils/apiclient.py b/dmutils/apiclient.py
@@ -22,7 +22,7 @@ def response_message(self):
 
 
 class BaseAPIClient(object):
-    def __init__(self, base_url=None, auth_token=None, enabled=None):
+    def __init__(self, base_url=None, auth_token=None, enabled=True):
         self.base_url = base_url
         self.auth_token = auth_token
         self.enabled = enabled
@@ -37,24 +37,25 @@ def _post(self, url, data):
         return self._request("POST", url, data=data)
 
     def _request(self, method, url, data=None, params=None):
-        if self.enabled:
-            try:
-                logger.debug("API request %s %s", method, url)
-                headers = {
-                    "Content-type": "application/json",
-                    "Authorization": "Bearer {}".format(self.auth_token),
-                }
-                response = requests.request(
-                    method, url,
-                    headers=headers, data=data, params=params)
-                response.raise_for_status()
-
-                return response.json()
-            except requests.HTTPError as e:
-                raise APIError(e)
-            except requests.RequestException as e:
-                logger.exception(e.message)
-                raise
+        if not self.enabled:
+            return None
+        try:
+            logger.debug("API request %s %s", method, url)
+            headers = {
+                "Content-type": "application/json",
+                "Authorization": "Bearer {}".format(self.auth_token),
+            }
+            response = requests.request(
+                method, url,
+                headers=headers, json=data, params=params)
+            response.raise_for_status()
+
+            return response.json()
+        except requests.HTTPError as e:
+            raise APIError(e)
+        except requests.RequestException as e:
+            logger.exception(e.message)
+            raise
 
 
 class SearchAPIClient(BaseAPIClient):