diff --git a/pankoclient/tests/unit/common/test_utils.py b/pankoclient/tests/unit/common/test_utils.py deleted file mode 100644 index 931d5a9..0000000 --- a/pankoclient/tests/unit/common/test_utils.py +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 2016 Huawei, Inc. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# - -import mock - -from pankoclient.common import utils -from pankoclient.tests.unit import base - - -class TestUtils(base.TestBase): - - def test_get_response_body_json(self): - resp = mock.Mock() - resp.headers = {'Content-Type': 'application/json'} - resp.json.return_value = mock.sentinel.fake_body - body = utils.get_response_body(resp) - self.assertEqual(mock.sentinel.fake_body, body) - - def test_get_response_body_json_value_error(self): - resp = mock.Mock() - resp.content = mock.sentinel.fake_content - resp.headers = {'Content-Type': 'application/json'} - resp.json.side_effect = ValueError('json format error.') - body = utils.get_response_body(resp) - self.assertEqual(mock.sentinel.fake_content, body) - - def test_get_response_body_raw(self): - resp = mock.Mock() - resp.headers = {'Content-Type': 'application/octet-stream'} - resp.body.return_value = mock.sentinel.fake_body - body = utils.get_response_body(resp) - self.assertEqual(mock.sentinel.fake_body, body) - - def test_get_response_body_unknown_type(self): - resp = mock.Mock() - resp.headers = {'Content-Type': 'application/unknown'} - body = utils.get_response_body(resp) - self.assertIsNone(body) diff --git a/pankoclient/common/utils.py b/pankoclient/utils.py similarity index 67% rename from pankoclient/common/utils.py rename to pankoclient/utils.py index c5fae55..b40ec5d 100644 --- a/pankoclient/common/utils.py +++ b/pankoclient/utils.py @@ -14,28 +14,6 @@ # from six.moves.urllib import parse as urllib_parse -import logging - -LOG = logging.getLogger(__name__) - - -def get_response_body(resp): - body = resp.content - content_type = resp.headers.get('Content-Type', '') - if 'application/json' in content_type: - try: - body = resp.json() - except ValueError: - LOG.error('Could not decode response body as JSON') - elif 'application/octet-stream' in content_type: - try: - body = resp.body() - except ValueError: - LOG.error('Could not decode response body as raw') - else: - body = None - return body - def get_pagination_options(limit=None, marker=None, sorts=None): options = [] diff --git a/pankoclient/v2/events.py b/pankoclient/v2/events.py index 5bea17b..f276799 100644 --- a/pankoclient/v2/events.py +++ b/pankoclient/v2/events.py @@ -12,7 +12,7 @@ # under the License. from pankoclient.common import base -from pankoclient.common import utils +from pankoclient import utils class Event(base.Resource):