summaryrefslogtreecommitdiffstats
path: root/tests/unit/test_processutils.py
diff options
context:
space:
mode:
authorChuck Short <chuck.short@canonical.com>2013-05-24 10:35:28 -0500
committerChuck Short <chuck.short@canonical.com>2013-05-31 12:17:38 -0500
commit2bdad357fa19f05a3a579b47578f1510974eb0a4 (patch)
treeec5303886a1155dd931518c93eb1d0ac2d3b7c95 /tests/unit/test_processutils.py
parentbabe5fd2f3cb5b3fb08597d537e9a44aa39609bd (diff)
downloadoslo-2bdad357fa19f05a3a579b47578f1510974eb0a4.tar.gz
oslo-2bdad357fa19f05a3a579b47578f1510974eb0a4.tar.xz
oslo-2bdad357fa19f05a3a579b47578f1510974eb0a4.zip
python3: python3 binary/text data compatbility
Python3 enforces the distinction between byte strings far more rigorously than Python 2 does; binary data cannot be automatically coerced to or from text data. Use six to provide a fake file object for textual data. It provides an alias for StringIO.StringIO in python2 and io.StringIO in python3 Change-Id: I65897bb0cca2cbeb5819a769b98645c9eb066401 Signed-off-by: Chuck Short <chuck.short@canonical.com>
Diffstat (limited to 'tests/unit/test_processutils.py')
-rw-r--r--tests/unit/test_processutils.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/unit/test_processutils.py b/tests/unit/test_processutils.py
index e00a66e..fbe9f34 100644
--- a/tests/unit/test_processutils.py
+++ b/tests/unit/test_processutils.py
@@ -19,9 +19,10 @@ from __future__ import print_function
import fixtures
import os
-import StringIO
import tempfile
+from six import StringIO
+
from openstack.common import processutils
from tests import utils
@@ -213,7 +214,7 @@ class FakeSshChannel(object):
return self.rc
-class FakeSshStream(StringIO.StringIO):
+class FakeSshStream(StringIO):
def setup_channel(self, rc):
self.channel = FakeSshChannel(rc)
@@ -225,9 +226,9 @@ class FakeSshConnection(object):
def exec_command(self, cmd):
stdout = FakeSshStream('stdout')
stdout.setup_channel(self.rc)
- return (StringIO.StringIO(),
+ return (StringIO(),
stdout,
- StringIO.StringIO('stderr'))
+ StringIO('stderr'))
class SshExecuteTestCase(utils.BaseTestCase):