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

Python3: use six.StringIO rather than StringIO.StringIO

Browse Source 
It’s an alias for StringIO.StringIO in Python 2 and
io.StringIO in Python 3.

Change-Id: I5316eaffa2d9d2d5679b85a901933ef0fbfcc2f7
This commit is contained in:
Yassine Lamgarchal
2014-01-10 17:25:25 +01:00
parent c473f19fc9
commit ae579aae09
6 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/v2/test_shell_v2.py
+3 -4
View File
@@ -15,9 +15,8 @@
# under the License.
# vim: tabstop=4 shiftwidth=4 softtabstop=4
import StringIO
import mock
import six
import testtools
from glanceclient.common import http
@@ -236,7 +235,7 @@ class ShellV2Test(testtools.TestCase):
{'id': 'pass', 'file': 'test', 'progress': False})
with mock.patch.object(self.gc.images, 'data') as mocked_data:
resp = test_utils.FakeResponse({}, StringIO.StringIO('CCC'))
resp = test_utils.FakeResponse({}, six.StringIO('CCC'))
ret = mocked_data.return_value = http.ResponseBodyIterator(resp)
test_shell.do_image_download(self.gc, args)
@@ -248,7 +247,7 @@ class ShellV2Test(testtools.TestCase):
{'id': 'pass', 'file': 'test', 'progress': True})
with mock.patch.object(self.gc.images, 'data') as mocked_data:
resp = test_utils.FakeResponse({}, StringIO.StringIO('CCC'))
resp = test_utils.FakeResponse({}, six.StringIO('CCC'))
mocked_data.return_value = http.ResponseBodyIterator(resp)
test_shell.do_image_download(self.gc, args)