openstack
/
python-muranoclient
Code Issues Proposed changes

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
This commit is contained in:
Ekaterina Fedorova 2014-08-11 16:29:44 +04:00 committed by Steve McLellan
parent 76b30bfb46
commit aa65a8cbe4
2 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
muranoclient/common/http.py
View File

@ -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):

24
muranoclient/v1/packages.py
View File

@ -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)