Small update for smoother errorhandling, also fix of destroy-method.

Author: jannefleischer

rdmo_client/client/http.py

@@ -1,4 +1,6 @@
 import requests
+from requests.exceptions import JSONDecodeError as RequestsJSONDecodeError
+#from json import JSONDecodeError
 
 
 class HTTPClient(object):
@@ -9,10 +11,17 @@ def __init__(self, base_url, auth, headers):
     def parse_response(self, response):
         try:
             response.raise_for_status()
-            return response.json()
         except requests.exceptions.HTTPError as e:
-            print(response.json())
+            try:
+                print(response.json())
+            except (RequestsJSONDecodeError):
+                print(response.content)
             raise e
+        try:
+            response_return = response.json()
+        except (RequestsJSONDecodeError):
+            response_return = response.content
+        return response_return
 
     def get(self, url, params={}):
         response = requests.get(self.base_url + url, params=params, auth=self.auth, headers=self.headers)

rdmo_client/client/rest.py

@@ -38,4 +38,4 @@ def update(self, resource_url, pk, data, **kwargs):
 
     def destroy(self, resource_url, pk, **kwargs):
         url = self._build_url(resource_url, kwargs, pk)
-        return self.delete(url, pk)
+        return self.delete(url) #pk included in url, thats sufficient