Handling 202 empty body responses gracefully.

jkeyes · jkeyes · commit d98f10aafc38 · 2015-04-01T17:04:51.000+01:00
diff --git a/intercom/api_operations/save.py b/intercom/api_operations/save.py
@@ -10,7 +10,8 @@ def create(cls, **params):
         from intercom import Intercom
         collection = utils.resource_class_to_collection_name(cls)
         response = Intercom.post("/%s/" % (collection), **params)
-        return cls(**response)
+        if response:  # may be empty if we received a 202
+            return cls(**response)
 
     def from_dict(self, pdict):
         for key, value in list(pdict.items()):
diff --git a/intercom/request.py b/intercom/request.py
@@ -42,7 +42,10 @@ def send_request_to_path(cls, method, url, auth, params=None):
     @classmethod
     def parse_body(cls, resp):
         try:
-            body = json.loads(resp.content.decode())
+            decoded_body = resp.content.decode()
+            if not decoded_body:  # return early for empty responses (issue-72)
+                return
+            body = json.loads(decoded_body)
             if body.get('type') == 'error.list':
                 cls.raise_application_errors_on_failure(body, resp.status_code)
             return body
diff --git a/tests/integration/issues/test_72.py b/tests/integration/issues/test_72.py
@@ -2,7 +2,9 @@
 
 import os
 import unittest
+import time
 from intercom import Intercom
+from intercom import Event
 from intercom import User
 
 Intercom.app_id = os.environ.get('INTERCOM_APP_ID')
@@ -13,3 +15,11 @@ class Issue72Test(unittest.TestCase):
 
     def test(self):
         User.create(email='me@example.com')
+        # no exception here as empty response expected
+        data = {
+            'event_name': 'Eventful 1',
+            'created_at': int(time.time()),
+            'email': 'me@example.com'
+        }
+        print data
+        Event.create(**data)
