Merge remote-tracking branch 'origin/master'

jkeyes · jkeyes · commit 61977a913929 · 2013-02-25T22:46:06.000Z
diff --git a/intercom/intercom.py b/intercom/intercom.py
@@ -45,7 +45,10 @@ def wrapper(*args, **kwargs):
         response = func_to_decorate(*args, **kwargs)
         if response.status_code == 401:
             raise AuthenticationError("Invalid API key/username provided.")
-        result = json.loads(response.content)
+        try:
+            result = json.loads(response.content)
+        except ValueError as err:
+            raise ServerError(err.message)
         if response.status_code in (200, 201):
             pass
         else:
diff --git a/tests/unit/fixtures/invalid.json b/tests/unit/fixtures/invalid.json
diff --git a/tests/unit/test_intercom.py b/tests/unit/test_intercom.py
@@ -77,3 +77,8 @@ def test_not_found(self):
     @patch('requests.request', create_response(500, '500.json'))
     def test_api_error(self):
         resp = Intercom.get_users()
+
+    @raises(ServerError)
+    @patch('requests.request', create_response(500, 'invalid.json'))
+    def test_api_error_when_json_is_invalid(self):
+        Intercom.get_users()
