From 144f6f811329de9633800e10844e4b8ec0948e68 Mon Sep 17 00:00:00 2001 From: Charles Short Date: Mon, 12 Jul 2021 14:03:37 -0400 Subject: [PATCH] py3: Use StringIO from six StringIO was moved in Python3. Use StringIO from six to maintain compatibility with python2 and python3. Story: 2006796 Task: 42816 Signed-off-by: Charles Short Change-Id: Ib698aa4e5815ea74e9c73c8579f95a9b411d3010 --- service-mgmt-client/sm-client/sm_client/common/http.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/service-mgmt-client/sm-client/sm_client/common/http.py b/service-mgmt-client/sm-client/sm_client/common/http.py index 30b3c97b..88e4b531 100644 --- a/service-mgmt-client/sm-client/sm_client/common/http.py +++ b/service-mgmt-client/sm-client/sm_client/common/http.py @@ -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)