openstack
/
oslo.concurrency
Code Issues Proposed changes

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>
This commit is contained in:
Chuck Short 2013-05-24 10:35:28 -05:00
parent 816c2fe785
commit 0a078f1a1e
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/unit/test_processutils.py
View File

@ -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):