starlingx
/
ha
Code Issues Proposed changes

Merge "py3: Use StringIO from six" into f/centos8

This commit is contained in:
Zuul 2021-07-20 18:25:59 +00:00 committed by Gerrit Code Review
parent 8655ae2aa1 144f6f8113
commit 6cb303be1a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
service-mgmt-client/sm-client/sm_client/common/http.py
View File

@ -22,7 +22,7 @@ import six.moves.http_client
import logging
import os
import socket
import StringIO
from six import StringIO
from six.moves.urllib.parse import urlparse
try:
@ -166,9 +166,10 @@ class HTTPClient(object):
# Read body into string if it isn't obviously image data
body_str = None
if resp.getheader('content-type', None) != 'application/octet-stream':
body_str = ''.join([chunk for chunk in body_iter])
body_str = b''.join([chunk for chunk in body_iter])
body_str = body_str.decode("utf-8")
self.log_http_response(resp, body_str)
body_iter = StringIO.StringIO(body_str)
body_iter = StringIO(body_str)
else:
self.log_http_response(resp)