Adding support for no supplied response encoding (intercom#91).

jkeyes · jkeyes · commit f911a5fedf1a · 2015-05-12T13:24:21.000+01:00
diff --git a/intercom/request.py b/intercom/request.py
@@ -56,16 +56,17 @@ def send_request_to_path(cls, method, url, auth, params=None):
         cls.raise_errors_on_failure(resp)
         cls.set_rate_limit_details(resp)
 
-        if resp.content:
+        if resp.content and resp.content.strip():
+            # parse non empty bodies
             return cls.parse_body(resp)
 
     @classmethod
     def parse_body(cls, resp):
         try:
-            # use supplied encoding to decode the response content
-            decoded_body = resp.content.decode(resp.encoding)
-            if not decoded_body:  # return early for empty responses (issue-72)
-                return
+            # use supplied or inferred encoding to decode the
+            # response content
+            decoded_body = resp.content.decode(
+                resp.encoding or resp.apparent_encoding)
             body = json.loads(decoded_body)
             if body.get('type') == 'error.list':
                 cls.raise_application_errors_on_failure(body, resp.status_code)
diff --git a/tests/unit/test_request.py b/tests/unit/test_request.py
@@ -224,3 +224,35 @@ def it_raises_a_multiple_matching_users_error(self):
             mock_method.return_value = resp
             with assert_raises(intercom.MultipleMatchingUsersError):
                 Intercom.get('/users')
+
+    @istest
+    def it_handles_empty_responses(self):
+        resp = mock_response('', status_code=202)
+        with patch('requests.request') as mock_method:
+            mock_method.return_value = resp
+            Request.send_request_to_path('GET', 'events', ('x', 'y'), resp)
+
+        resp = mock_response(' ', status_code=202)
+        with patch('requests.request') as mock_method:
+            mock_method.return_value = resp
+            Request.send_request_to_path('GET', 'events', ('x', 'y'), resp)
+
+    @istest
+    def it_handles_no_encoding(self):
+        resp = mock_response(
+            ' ', status_code=200, encoding=None, headers=None)
+        resp.apparent_encoding = 'utf-8'
+
+        with patch('requests.request') as mock_method:
+            mock_method.return_value = resp
+            Request.send_request_to_path('GET', 'events', ('x', 'y'), resp)
+
+    @istest
+    def it_needs_encoding_or_apparent_encoding(self):
+        resp = mock_response(
+            '{}', status_code=200, encoding=None, headers=None)
+
+        with patch('requests.request') as mock_method:
+            mock_method.return_value = resp
+            with assert_raises(TypeError):
+                Request.send_request_to_path('GET', 'events', ('x', 'y'), resp)
