From 440d15555888a5e1643523dcba04d16660f7ee3b Mon Sep 17 00:00:00 2001 From: Yassine Lamgarchal Date: Fri, 10 Jan 2014 17:16:09 +0100 Subject: [PATCH] Python3: use six.StringIO rather than StringIO.StringIO MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It’s an alias for StringIO.StringIO in Python 2 and io.StringIO in Python 3. Change-Id: I1c2f1412c586d5d8e0aa866a28232747056e0ca7 --- glanceclient/common/http.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/glanceclient/common/http.py b/glanceclient/common/http.py index 9d96342..9157ef3 100644 --- a/glanceclient/common/http.py +++ b/glanceclient/common/http.py @@ -19,10 +19,10 @@ import hashlib import logging import posixpath import socket -import StringIO import struct import urlparse +import six from six.moves import http_client try: @@ -240,7 +240,7 @@ class HTTPClient(object): if resp.getheader('content-type', None) != 'application/octet-stream': body_str = ''.join([chunk for chunk in body_iter]) self.log_http_response(resp, body_str) - body_iter = StringIO.StringIO(body_str) + body_iter = six.StringIO(body_str) else: self.log_http_response(resp)