From 2bdad357fa19f05a3a579b47578f1510974eb0a4 Mon Sep 17 00:00:00 2001 From: Chuck Short Date: Fri, 24 May 2013 10:35:28 -0500 Subject: 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 --- tests/unit/test_jsonutils.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tests/unit/test_jsonutils.py') diff --git a/tests/unit/test_jsonutils.py b/tests/unit/test_jsonutils.py index 35a9487..758455b 100644 --- a/tests/unit/test_jsonutils.py +++ b/tests/unit/test_jsonutils.py @@ -16,9 +16,10 @@ # under the License. import datetime -import StringIO import xmlrpclib +from six import StringIO + from openstack.common import jsonutils from tests import utils @@ -32,7 +33,7 @@ class JSONUtilsTestCase(utils.BaseTestCase): self.assertEqual(jsonutils.loads('{"a": "b"}'), {'a': 'b'}) def test_load(self): - x = StringIO.StringIO('{"a": "b"}') + x = StringIO('{"a": "b"}') self.assertEqual(jsonutils.load(x), {'a': 'b'}) -- cgit