openstack/python-swiftclient
Code Issues Proposed changes

Fix up StringIO use in tests for py3

Browse Source 
Some spots in this file were already referencing six.StringIO, but
some were still using StringIO.StringIO, which does not work on
py3. This patch just makes them all use six.StringIO and removes the
now-unused (and wrong, on py3) import.

Change-Id: I3c7311c3983f4eb409eedb6f85ede6ffe4059e63
This commit is contained in:
Samuel Merritt
2014-04-23 13:04:54 -07:00
parent 1893cbec88
commit 1353f2412b
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/test_swiftclient.py
View File

@@ -24,7 +24,6 @@ except ImportError:
import six
import socket
import types
import StringIO
import testtools
import warnings
from six.moves.urllib.parse import urlparse
@@ -681,7 +680,7 @@ class TestPutObject(MockHttpTest):
conn[1]._request = resp._fake_request
astring = 'asdf'
astring_len = len(astring)
mock_file = StringIO.StringIO(astring)
mock_file = six.StringIO(astring)
c.put_object(url='http://www.test.com', http_conn=conn,
contents=mock_file, content_length=astring_len)
@@ -690,7 +689,7 @@ class TestPutObject(MockHttpTest):
self.assertEqual(astring_len,
len(resp.requests_params['data'].read()))
mock_file = StringIO.StringIO(astring)
mock_file = six.StringIO(astring)
c.put_object(url='http://www.test.com', http_conn=conn,
headers={'Content-Length': str(astring_len)},
contents=mock_file)
@@ -707,7 +706,7 @@ class TestPutObject(MockHttpTest):
conn[1]._request = resp._fake_request
raw_data = 'asdf' * 256
chunk_size = 16
mock_file = StringIO.StringIO(raw_data)
mock_file = six.StringIO(raw_data)
c.put_object(url='http://www.test.com', http_conn=conn,
contents=mock_file, chunk_size=chunk_size)