openstack/python-watcherclient
Code Issues Proposed changes

Merge "Fix watherclient error in py3"

Browse Source
This commit is contained in:
Zuul
2018-07-27 09:27:56 +00:00
committed by Gerrit Code Review
parent 6681724daa 2551ff0934
commit 0b8dba2cb9
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
watcherclient/common/httpclient.py
View File

@@ -354,7 +354,15 @@ class HTTPClient(VersionNegotiationMixin):
# Read body into string if it isn't obviously image data # Read body into string if it isn't obviously image data
body_str = None body_str = None
if resp.headers.get('Content-Type') != 'application/octet-stream': if resp.headers.get('Content-Type') != 'application/octet-stream':
body_str = ''.join([chunk for chunk in body_iter]) # decoding byte to string is necessary for Python 3 compatibility
# this issues has not been found with Python 3 unit tests
# because the test creates a fake http response of type str
# the if statement satisfies test (str) and real (bytes) behavior
body_list = [
chunk.decode("utf-8") if isinstance(chunk, bytes)
else chunk for chunk in body_iter
]
body_str = ''.join(body_list)
self.log_http_response(resp, body_str) self.log_http_response(resp, body_str)
body_iter = six.StringIO(body_str) body_iter = six.StringIO(body_str)
else: else: