diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-03-20 15:47:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-03-20 15:47:47 +0000 |
| commit | 8ff7d56037a002f442e024416062c75c34dc0759 (patch) | |
| tree | ff672c1b2ba118918d470cadbefb4936112ddd90 | |
| parent | d721dc7b61dabe49a603b781d44a05bfd9c9bed4 (diff) | |
| parent | 26e644f7bbd8fe6af43024a3da8f12d2e0f92a9d (diff) | |
| download | python-swiftclient-8ff7d56037a002f442e024416062c75c34dc0759.tar.gz | |
Merge "Use six.StringIO instead of StringIO.StringIO"
| -rw-r--r-- | test-requirements.txt | 1 | ||||
| -rw-r--r-- | tests/test_command_helpers.py | 2 | ||||
| -rw-r--r-- | tests/test_swiftclient.py | 6 |
3 files changed, 5 insertions, 4 deletions
diff --git a/test-requirements.txt b/test-requirements.txt index d5673f3..936735e 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,6 +4,7 @@ coverage>=3.6 discover mock>=1.0 python-keystoneclient>=0.6.0 +six>=1.5.2 sphinx>=1.1.2,<1.2 testrepository>=0.0.18 testtools>=0.9.34 diff --git a/tests/test_command_helpers.py b/tests/test_command_helpers.py index 225805b..140e915 100644 --- a/tests/test_command_helpers.py +++ b/tests/test_command_helpers.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from StringIO import StringIO +from six import StringIO import mock import testtools diff --git a/tests/test_swiftclient.py b/tests/test_swiftclient.py index cb7a0c0..b57bf9f 100644 --- a/tests/test_swiftclient.py +++ b/tests/test_swiftclient.py @@ -16,8 +16,8 @@ # TODO: More tests import mock import logging +import six import socket -import StringIO import testtools import warnings from urlparse import urlparse @@ -576,7 +576,7 @@ class TestPutObject(MockHttpTest): def test_unicode_ok(self): conn = c.http_connection(u'http://www.test.com/') - mock_file = StringIO.StringIO(u'\u5929\u7a7a\u4e2d\u7684\u4e4c\u4e91') + mock_file = six.StringIO(u'\u5929\u7a7a\u4e2d\u7684\u4e4c\u4e91') args = (u'\u5929\u7a7a\u4e2d\u7684\u4e4c\u4e91', '\u5929\u7a7a\u4e2d\u7684\u4e4c\u4e91', u'\u5929\u7a7a\u4e2d\u7684\u4e4c\u4e91', @@ -596,7 +596,7 @@ class TestPutObject(MockHttpTest): def test_chunk_warning(self): conn = c.http_connection('http://www.test.com/') - mock_file = StringIO.StringIO('asdf') + mock_file = six.StringIO('asdf') args = ('asdf', 'asdf', 'asdf', 'asdf', mock_file) resp = MockHttpResponse() conn[1].getresponse = resp.fake_response |