Modifying parse_body so local var body is always in scope. intercom#72

jkeyes · jkeyes · commit 714de5a97b03 · 2015-03-31T23:10:11.000+01:00
diff --git a/intercom/request.py b/intercom/request.py
@@ -43,11 +43,11 @@ def send_request_to_path(cls, method, url, auth, params=None):
     def parse_body(cls, resp):
         try:
             body = json.loads(resp.content.decode())
+            if body.get('type') == 'error.list':
+                cls.raise_application_errors_on_failure(body, resp.status_code)
+            return body
         except ValueError:
             cls.raise_errors_on_failure(resp)
-        if body.get('type') == 'error.list':
-            cls.raise_application_errors_on_failure(body, resp.status_code)
-        return body
 
     @classmethod
     def set_rate_limit_details(cls, resp):
diff --git a/tests/integration/issues/__init__.py b/tests/integration/issues/__init__.py
@@ -0,0 +1 @@
+# -*- coding: utf-8 -*-
diff --git a/tests/integration/issues/test_72.py b/tests/integration/issues/test_72.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+import os
+import unittest
+from intercom import Intercom
+from intercom import User
+
+Intercom.app_id = os.environ.get('INTERCOM_APP_ID')
+Intercom.app_api_key = os.environ.get('INTERCOM_APP_API_KEY')
+
+
+class Issue72Test(unittest.TestCase):
+
+    def test(self):
+        User.create(email='me@example.com')
