better exception message; handle failed requests

Author: Shariq Hashme

scaleapi/__init__.py

@@ -22,7 +22,7 @@
 
 class ScaleException(Exception):
     def __init__(self, message, errcode):
-        super(ScaleException, self).__init__(message)
+        super(ScaleException, self).__init__('<Response [{}]> {}'.format(errcode, message))
         self.code = errcode
 
 
@@ -57,7 +57,12 @@ def _getrequest(self, endpoint, params={}):
 
         if r.status_code == 200:
             return r.json()
-        raise ScaleException(r.json()['error'], r.status_code)
+        else:
+            try:
+                raise ScaleException(r.json()['error'], r.status_code)
+            except ValueError:
+                pass
+            raise ScaleException(r.text, r.status_code)
 
     def _postrequest(self, endpoint, payload=None):
         """Makes a post request to an endpoint.
@@ -73,9 +78,12 @@ def _postrequest(self, endpoint, payload=None):
 
         if r.status_code == 200:
             return r.json()
-        if r.status_code == 400:
-            raise ScaleInvalidRequest(r.json()['error'], r.status_code)
-        raise ScaleException(r.json()['error'], r.status_code)
+        else:
+            try:
+                raise ScaleException(r.json()['error'], r.status_code)
+            except ValueError:
+                pass
+            raise ScaleException(r.text, r.status_code)
 
     def fetch_task(self, task_id):
         """Fetches a task.