fixup! Add Python 3 compatibility

tilecloud_chain/tests/__init__.py

@@ -5,7 +5,7 @@
 import os
 import re
 import shutil
-from six.moves import cStringIO
+from six import StringIO
 from six import text_type as str, PY3
 from unittest2 import TestCase
 
@@ -37,9 +37,9 @@ def assert_result_equals(self, result, expected, regex=False):
 
     def run_cmd(self, cmd, main_func):
         old_stdout = sys.stdout
-        sys.stdout = mystdout = cStringIO()
+        sys.stdout = mystdout = StringIO()
         old_stderr = sys.stderr
-        sys.stderr = mystderr = cStringIO()
+        sys.stderr = mystderr = StringIO()
         self.assert_main_equals(cmd, main_func, [])
         sys.stdout = old_stdout
         sys.stderr = old_stderr
@@ -51,7 +51,11 @@ def assert_cmd_equals(self, cmd, main_func, empty_err=False, **kargs):
         out, err = self.run_cmd(cmd, main_func)
         if empty_err:
             self.assertEqual(err, '')
-        out = out if PY3 else str(out)
+        if PY3:
+            if isinstance(out, bytes):
+                out = out.decode('utf-8')
+        else:
+            out = str(out)
         self.assert_result_equals(result=out, **kargs)
 
     def assert_cmd_exit_equals(self, cmd, main_func, expected):
@@ -100,7 +104,7 @@ def assert_yaml_equals(self, result, expected):
 
     def assert_cmd_yaml_equals(self, cmd, main_func, **kargs):
         old_stdout = sys.stdout
-        sys.stdout = mystdout = cStringIO()
+        sys.stdout = mystdout = StringIO()
         self.assert_main_equals(cmd, main_func, [])
         sys.stdout = old_stdout
         self.assert_yaml_equals(result=mystdout.getvalue(), **kargs)