Merge pull request #9 from scaleapi/shariq

Improved error handling and exception print message

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,15 @@ def _getrequest(self, endpoint, params={}):
 
         if r.status_code == 200:
             return r.json()
-        raise ScaleException(r.json()['error'], r.status_code)
+        else:
+            try:
+                error = r.json()['error']
+            except ValueError:
+                error = r.text
+            if r.status_code == 400:
+                raise ScaleInvalidRequest(error, r.status_code)
+            else:
+                raise ScaleException(error, r.status_code)
 
     def _postrequest(self, endpoint, payload=None):
         """Makes a post request to an endpoint.
@@ -73,9 +81,15 @@ 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:
+                error = r.json()['error']
+            except ValueError:
+                error = r.text
+            if r.status_code == 400:
+                raise ScaleInvalidRequest(error, r.status_code)
+            else:
+                raise ScaleException(error, r.status_code)
 
     def fetch_task(self, task_id):
         """Fetches a task.

setup.py

@@ -25,12 +25,11 @@
 setup(
     name = 'scaleapi',
     packages = ['scaleapi'],
-    version = '0.2.13',
-    description = 'The official Python client library for the Scale API, the API for human labor.',
+    version = '0.2.14',
+    description = 'The official Python client library for the Scale API, the API for human intelligence.',
     author = 'Calvin Huang',
     author_email = 'c@lvin.me',
     url = 'https://github.com/scaleapi/scaleapi-python-client',
-    download_url = 'https://github.com/scaleapi/scaleapi-python-client/tarball/0.1.10',
     keywords = ['scale', 'scaleapi', 'humans', 'tasks', 'categorization', 'transcription', 'annotation', 'comparison', 'data collection', 'audio transcription'],
     install_requires = install_requires,
     classifiers = ['Programming Language :: Python :: 2.7',