Integrating changes from PR#88 and PR#90

maiiku · maiiku · commit f0ee5713b83f · 2015-05-08T12:38:52.000+02:00
diff --git a/intercom/request.py b/intercom/request.py
@@ -42,12 +42,13 @@ def send_request_to_path(cls, method, url, auth, params=None):
     @classmethod
     def parse_body(cls, resp):
         try:
+            # return early for empty responses (issue-72)
+            if not resp.content or not resp.content.strip():
+                return
             # use supplied encoding to decode the response content
             decoded_body = resp.content.decode(
                 resp.encoding or resp.apparent_encoding
             )
-            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)
