Merge pull request #598 from ricellis/head-response-no-body

fix(all services): Don't try to deserialize a body on HEAD requests

Author: ehdsouza

test/unit/test_watson_service.py

@@ -52,6 +52,10 @@ def any_service_call(self):
         response = self.request(method='GET', url='', accept_json=True)
         return response
 
+    def head_request(self):
+        response = self.request(method='HEAD', url='', accept_json=True)
+        return response
+
 @responses.activate
 def test_url_encoding():
     service = AnyServiceV1('2017-07-07', username='username', password='password')
@@ -171,3 +175,19 @@ def test_disable_SSL_verification():
 
     service1.disable_SSL_verification()
     assert service1.verify is False
+
+@responses.activate
+def test_http_head():
+    service = AnyServiceV1('2018-11-20', username='username', password='password')
+    expectedHeaders = {'Test-Header1': 'value1', 'Test-Header2': 'value2'}
+    responses.add(responses.HEAD,
+                  service.default_url,
+                  status=200,
+                  headers=expectedHeaders,
+                  content_type=None)
+
+    response = service.head_request()
+    assert response is not None
+    assert len(responses.calls) == 1
+    assert response.headers is not None
+    assert response.headers == expectedHeaders

watson_developer_cloud/watson_service.py

@@ -463,7 +463,8 @@ def request(self, method, url, accept_json=False, headers=None,
                                     **kwargs)
 
         if 200 <= response.status_code <= 299:
-            if response.status_code == 204:
+            if response.status_code == 204 or method == 'HEAD':
+                # There is no body content for a HEAD request or a 204 response
                 return DetailedResponse(None, response.headers, response.status_code) if self.detailed_response else None
             if accept_json:
                 response_json = response.json()