Merge commit 'a4caa67aa982bb34f4f787084480504a65ee5da4'

Author: ehdsouza

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.4.0
+current_version = 0.4.1
 commit = True
 
 [bumpversion:file:ibm_cloud_sdk_core/version.py]

ibm_cloud_sdk_core/base_service.py

@@ -198,7 +198,7 @@ def set_username_and_password(self, username, password):
         self.password = password
         self.jar = CookieJar()
 
-    def set_token_manager(self, iam_apikey=None, iam_access_token=None, iam_url=None, 
+    def set_token_manager(self, iam_apikey=None, iam_access_token=None, iam_url=None,
                           iam_client_id=None, iam_client_secret=None):
         if has_bad_first_or_last_char(iam_apikey):
             raise ValueError('The credentials shouldn\'t start or end with curly brackets or quotes. '

ibm_cloud_sdk_core/detailed_response.py

@@ -41,7 +41,7 @@ def get_status_code(self):
     def _to_dict(self):
         _dict = {}
         if hasattr(self, 'result') and self.result is not None:
-            _dict['result'] = self.result if isinstance(self.result, dict) else 'HTTP response'
+            _dict['result'] = self.result if isinstance(self.result, (dict, list)) else 'HTTP response'
         if hasattr(self, 'headers') and self.headers is not None:
             _dict['headers'] = self.headers
         if hasattr(self, 'status_code') and self.status_code is not None:

ibm_cloud_sdk_core/iam_token_manager.py

@@ -25,7 +25,7 @@ class IAMTokenManager(object):
     REQUEST_TOKEN_RESPONSE_TYPE = 'cloud_iam'
     REFRESH_TOKEN_GRANT_TYPE = 'refresh_token'
 
-    def __init__(self, iam_apikey=None, iam_access_token=None, iam_url=None, 
+    def __init__(self, iam_apikey=None, iam_access_token=None, iam_url=None,
                  iam_client_id=None, iam_client_secret=None):
         self.iam_apikey = iam_apikey
         self.user_access_token = iam_access_token

ibm_cloud_sdk_core/version.py

@@ -1 +1 @@
-__version__ = '0.4.0'
+__version__ = '0.4.1'

setup.py

@@ -19,7 +19,7 @@
 from setuptools import setup
 from setuptools.command.test import test as TestCommand
 
-__version__ = '0.4.0'
+__version__ = '0.4.1'
 
 if sys.argv[-1] == 'publish':
     # test server

test/test_detailed_response.py

@@ -5,7 +5,7 @@
 from ibm_cloud_sdk_core import DetailedResponse
 
 @responses.activate
-def test_detailed_response():
+def test_detailed_response_dict():
     responses.add(responses.GET,
                   'https://test.com',
                   status=200,
@@ -22,3 +22,22 @@ def test_detailed_response():
     dict_repr = detailed_response._to_dict()
     assert dict_repr['result'] == {'foobar': 'baz'}
     detailed_response.__str__()
+
+@responses.activate
+def test_detailed_response_list():
+    responses.add(responses.GET,
+                  'https://test.com',
+                  status=200,
+                  body=json.dumps(['foobar', 'baz']),
+                  content_type='application/json')
+
+    mock_response = requests.get('https://test.com')
+    detailed_response = DetailedResponse(mock_response.json(), mock_response.headers, mock_response.status_code)
+    assert detailed_response is not None
+    assert detailed_response.get_result() == ['foobar', 'baz']
+    assert detailed_response.get_headers() == {u'Content-Type': 'application/json'}
+    assert detailed_response.get_status_code() == 200
+
+    dict_repr = detailed_response._to_dict()
+    assert dict_repr['result'] == ['foobar', 'baz']
+    detailed_response.__str__()