improved error handling

Author: Shariq Hashme

scaleapi/__init__.py

@@ -59,10 +59,10 @@ def _getrequest(self, endpoint, params={}):
             return r.json()
         else:
             try:
-                raise ScaleException(r.json()['error'], r.status_code)
+                error = r.json()['error']
             except ValueError:
-                pass
-            raise ScaleException(r.text, r.status_code)
+                error = r.text
+            raise ScaleException(error, r.status_code)
 
     def _postrequest(self, endpoint, payload=None):
         """Makes a post request to an endpoint.
@@ -80,10 +80,10 @@ def _postrequest(self, endpoint, payload=None):
             return r.json()
         else:
             try:
-                raise ScaleException(r.json()['error'], r.status_code)
+                error = r.json()['error']
             except ValueError:
-                pass
-            raise ScaleException(r.text, r.status_code)
+                error = r.text
+            raise ScaleException(error, r.status_code)
 
     def fetch_task(self, task_id):
         """Fetches a task.