womax/python-glanceclient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Python3: use six.StringIO rather than StringIO.StringIO"

Browse Source
This commit is contained in:
Jenkins
2014-01-11 17:21:07 +00:00
committed by Gerrit Code Review
parent 9dd03ce9ce 440d155558
commit d309da1bb2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glanceclient/common/http.py
+2 -2
View File
@@ -19,10 +19,10 @@ import hashlib
import logging import logging
import posixpath import posixpath
import socket import socket
import StringIO
import struct import struct
import urlparse import urlparse
import six
from six.moves import http_client from six.moves import http_client
try: try:
@@ -240,7 +240,7 @@ class HTTPClient(object):
if resp.getheader('content-type', None) != 'application/octet-stream': if resp.getheader('content-type', None) != 'application/octet-stream':
body_str = ''.join([chunk for chunk in body_iter]) body_str = ''.join([chunk for chunk in body_iter])
self.log_http_response(resp, body_str) self.log_http_response(resp, body_str)
body_iter = StringIO.StringIO(body_str) body_iter = six.StringIO(body_str)
else: else:
self.log_http_response(resp) self.log_http_response(resp)