From 2da242b5e624aca59b402839a6cad678f2d54a59 Mon Sep 17 00:00:00 2001 From: Petr Blaho Date: Tue, 18 Feb 2014 11:34:18 +0100 Subject: [PATCH] Use six.StringIO/BytesIO instead of StringIO.StringIO to keep Python 3.x compatibility, use six.StringIO/BytesIO to replace StringIO.StringIO StringIO works for unicode BytesIO works for bytes Change-Id: Iba4087cb7a3dd6d1b24744cda0bfa5f45c94f386 Closes-Bug: #1280100 --- tuskarclient/tests/common/test_formatting.py | 4 ++-- tuskarclient/tests/v1/test_overcloud_roles_shell.py | 4 ++-- tuskarclient/tests/v1/test_overclouds_shell.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tuskarclient/tests/common/test_formatting.py b/tuskarclient/tests/common/test_formatting.py index d315c6e..6d26626 100644 --- a/tuskarclient/tests/common/test_formatting.py +++ b/tuskarclient/tests/common/test_formatting.py @@ -10,8 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -import io import mock +import six import tuskarclient.common.formatting as fmt import tuskarclient.tests.utils as tutils @@ -21,7 +21,7 @@ class PrintTest(tutils.TestCase): def setUp(self): super(PrintTest, self).setUp() - self.outfile = io.StringIO() + self.outfile = six.StringIO() def test_print_dict(self): dict_ = {'k': 'v', 'key': 'value'} diff --git a/tuskarclient/tests/v1/test_overcloud_roles_shell.py b/tuskarclient/tests/v1/test_overcloud_roles_shell.py index 3792d6d..538cb34 100644 --- a/tuskarclient/tests/v1/test_overcloud_roles_shell.py +++ b/tuskarclient/tests/v1/test_overcloud_roles_shell.py @@ -10,8 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -import io import mock +import six import tuskarclient.tests.utils as tutils from tuskarclient.v1 import overcloud_roles_shell @@ -36,7 +36,7 @@ class RacksShellTest(tutils.TestCase): def setUp(self): - self.outfile = io.StringIO() + self.outfile = six.StringIO() self.tuskar = mock.MagicMock() self.shell = overcloud_roles_shell super(RacksShellTest, self).setUp() diff --git a/tuskarclient/tests/v1/test_overclouds_shell.py b/tuskarclient/tests/v1/test_overclouds_shell.py index e6c7aa0..976dba0 100644 --- a/tuskarclient/tests/v1/test_overclouds_shell.py +++ b/tuskarclient/tests/v1/test_overclouds_shell.py @@ -10,8 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -import io import mock +import six import tuskarclient.tests.utils as tutils from tuskarclient.v1 import overclouds_shell @@ -36,7 +36,7 @@ class RacksShellTest(tutils.TestCase): def setUp(self): - self.outfile = io.StringIO() + self.outfile = six.StringIO() self.tuskar = mock.MagicMock() self.shell = overclouds_shell super(RacksShellTest, self).setUp()