From ba72a3e1735c7e85f063a9844ecdeaf8567fbb7d Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Fri, 1 May 2015 14:33:33 +0100
Subject: [PATCH 1/2] This commit fixes problems with the utils package

The problems were stopping the admin frontend from working
---
 dmutils/apiclient.py | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/dmutils/apiclient.py b/dmutils/apiclient.py
index 701fb8ed..a743c819 100644
--- 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):

From 0090b7f70e310e0abfd6d2a646f5a56a9d463c52 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Fri, 1 May 2015 14:36:30 +0100
Subject: [PATCH 2/2] Bump version to 0.4.1

---
 dmutils/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dmutils/__init__.py b/dmutils/__init__.py
index abeeedbf..f0ede3d3 100644
--- a/dmutils/__init__.py
+++ b/dmutils/__init__.py
@@ -1 +1 @@
-__version__ = '0.4.0'
+__version__ = '0.4.1'