Add BadRequestError Exception

Author: ingmferrer

salesforce/client.py

@@ -1,6 +1,6 @@
 import requests
 from salesforce.decorators import access_token_required
-from salesforce.exceptions import UnknownError, BadOAuthTokenError
+from salesforce.exceptions import UnknownError, BadOAuthTokenError, BadRequestError
 from urllib.parse import unquote, urlencode
 
 
@@ -154,11 +154,16 @@ def _request(self, method, url, headers=None, **kwargs):
         return self._parse(requests.request(method, url, headers=_headers, **kwargs))
 
     def _parse(self, response):
+        content_type = response.headers.get('Content-Type', None)
         status_code = response.status_code
         if status_code == 200 or status_code == 201:
-            return response.json()
+            if content_type and 'application/json' in content_type:
+                return response.json()
+            return response.text
         if status_code == 204:
             return None
+        if status_code == 400:
+            raise BadRequestError()
         if status_code == 403:
             raise BadOAuthTokenError()
         raise UnknownError()

salesforce/exceptions.py

@@ -12,3 +12,7 @@ class AccessTokenRequired(BaseError):
 
 class BadOAuthTokenError(BaseError):
     pass
+
+
+class BadRequestError(BaseError):
+    pass

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup
 
 setup(name='salesforce',
-      version='0.1',
+      version='0.2',
       description='API wrapper for Salesforce written in Python',
       url='https://github.com/GearPlug/salesforce-python',
       author='Miguel Ferrer',