From aa65a8cbe414b80a47f4da723a557c7b9d9f4bbb Mon Sep 17 00:00:00 2001 From: Ekaterina Fedorova Date: Mon, 11 Aug 2014 16:29:44 +0400 Subject: [PATCH] Fix some calls after switch to 'requests' * Just one value is returned * 'status' response attribute is now called 'status_code' * Method log_http_response decoded requests content, which is unnessesary Change-Id: I6308b78bb40a547bdaef02f44d815eb482524b15 Closes-Bug: #1355133 --- muranoclient/common/http.py | 6 ------ muranoclient/v1/packages.py | 24 ++++++++++++------------ 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/muranoclient/common/http.py b/muranoclient/common/http.py index bd829485..141f0f0f 100644 --- a/muranoclient/common/http.py +++ b/muranoclient/common/http.py @@ -19,7 +19,6 @@ import os import socket import requests -import six from six.moves.urllib import parse from muranoclient.common import exceptions as exc @@ -112,11 +111,6 @@ class HTTPClient(object): dump = ['\nHTTP/%.1f %s %s' % status] dump.extend(['%s: %s' % (k, v) for k, v in resp.headers.items()]) dump.append('') - if resp.content: - content = resp.content - if isinstance(content, six.binary_type): - content = content.decode() - dump.extend([content, '']) LOG.debug('\n'.join(dump)) def _http_request(self, url, method, **kwargs): diff --git a/muranoclient/v1/packages.py b/muranoclient/v1/packages.py index 27933f60..240435de 100644 --- a/muranoclient/v1/packages.py +++ b/muranoclient/v1/packages.py @@ -111,9 +111,9 @@ class PackageManager(base.Manager): def download(self, app_id): url = '/v1/catalog/packages/{0}/download'.format(app_id) - response, iterator = self.api.raw_request('GET', url) - if response.status == 200: - return ''.join(iterator) + response = self.api.raw_request('GET', url) + if response.status_code == 200: + return response.content else: raise exceptions.from_response(response) @@ -135,24 +135,24 @@ class PackageManager(base.Manager): loader_cls = yaml.Loader url = '/v1/catalog/packages/{0}/ui'.format(app_id) - response, iterator = self.api.raw_request('GET', url) - if response.status == 200: - return yaml.load(''.join(iterator), loader_cls) + response = self.api.raw_request('GET', url) + if response.status_code == 200: + return yaml.load(response.content, loader_cls) else: raise exceptions.from_response(response) def get_logo(self, app_id): url = '/v1/catalog/packages/{0}/logo'.format(app_id) - response, iterator = self.api.raw_request('GET', url) - if response.status == 200: - return ''.join(iterator) + response = self.api.raw_request('GET', url) + if response.status_code == 200: + return response.content else: raise exceptions.from_response(response) def get_supplier_logo(self, app_id): url = '/v1/catalog/packages/{0}/supplier_logo'.format(app_id) - response, iterator = self.api.raw_request('GET', url) - if response.status == 200: - return ''.join(iterator) + response = self.api.raw_request('GET', url) + if response.status_code == 200: + return response.content else: raise exceptions.from_response(response)