Merge pull request #30 from thlisym/fix/image-deletion-and-json-error

Wraps any JSON error with our custom exception and fixes the delete i…

hetznercloud/images.py

@@ -66,7 +66,7 @@ def update(self, description=None, type=None):
 
     def delete(self):
         status_code, result = _get_results(self._config, "images/%s" % self.id, method="DELETE")
-        if status_code != 200:
+        if status_code != 204:
             raise HetznerActionException(result)
 
     @staticmethod

hetznercloud/shared.py

@@ -31,8 +31,11 @@ def _get_results(config, endpoint, url_params=None, body=None, method="GET"):
     if not request.text:
         return request.status_code, ""
 
-    js = request.json()
-    if "action" in js and "error" in js["action"] and js["action"]["error"] is not None:
-        raise HetznerActionException(js["action"]["error"])
-
-    return request.status_code, js
+    try:
+        js = request.json()
+        if "action" in js and "error" in js["action"] and js["action"]["error"] is not None:
+            raise HetznerActionException(js["action"]["error"])
+
+        return request.status_code, js
+    except json.decoder.JSONDecodeError:
+        raise HetznerInternalServerErrorException("failed to deserialise JSON")