Avoid parsing body if response is 204. Fixes #109

Author: Alvaro Navarro

amadeus/mixins/parser.py

@@ -26,6 +26,8 @@ def error_for(self, status_code, parsed):  # noqa: C901
             return NotFoundError
         if status_code >= 400:
             return ClientError
+        if status_code == 204:
+            return None
         if not parsed:
             return ParserError
 
@@ -44,7 +46,14 @@ def _parse_data(self, client):
         self.result = None
         self.headers = {}
 
-        self.__parse_body_and_headers(self.http_response, client)
+        self.__parse_headers(self.http_response, client)
+
+        # Avoid parsing body in 204 responses
+        if self.status_code == 204:
+            return
+
+        self.__parse_body(self.http_response, client)
+
         self.result = self.__parse_json(client)
         if (self.result is not None):
             self.data = self.result.get('data', None)
@@ -57,12 +66,14 @@ def __raise_error(self, error_class, client):
         error._log(client)
         raise error
 
-    # Extract the body and headers
-    def __parse_body_and_headers(self, http_response, client):
+    def __parse_headers(self, http_response, client):
         if hasattr(http_response, 'getheaders'):
             self.headers = dict(http_response.getheaders()) or self.headers
         if hasattr(http_response, 'info'):
             self.headers = http_response.info() or self.headers
+
+    # Extract the body and headers
+    def __parse_body(self, http_response, client):
         if hasattr(http_response, 'read'):
             self.body = http_response.read()
         if hasattr(self.body, 'decode'):

specs/mixins/parser_spec.py

@@ -40,6 +40,20 @@
                 response._parse(self.client)
                 expect(response.data).to(equal({'a': 1}))
 
+            with it('should not parse body if status code equal to 204'):
+                with Stub() as http_response:
+                    http_response.status_code = '204'
+                    http_response.getheaders().returns(
+                        [('Content-Type', 'application/vnd.amadeus+json')]
+                    )
+
+                response = Response(http_response, self.request)
+                response._parse(self.client)
+                expect(response.parsed).to(equal(False))
+                expect(response.body).to(equal(None))
+                expect(response.result).to(be(None))
+                expect(response.data).to(be(None))
+
             with it('should parse no body for other content types'):
                 with Stub() as http_response:
                     http_response.status_code = '200'
@@ -128,3 +142,10 @@
             expect(lambda: self.response._detect_error(self.client)).to(
                 raise_error(ParserError)
             )
+
+        with it('should not raise parse error for 204 responses'):
+            self.response.status_code = 204
+            self.response.parsed = False
+            expect(lambda: self.response._detect_error(self.client)).not_to(
+                raise_error(ParserError)
+            )