Use six.Stringio instead of StringIO.StringIO

The StringIO class was moved to the io module.
(In Python 2, io.StringIO is available, but is Unicode-only.)

Reviewed-By: David Kupka <dkupka@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Reviewed-By: Martin Basti <mbasti@redhat.com>

2 files changed, 5 insertions, 5 deletions

diff --git a/ipatests/test_cmdline/test_cli.py b/ipatests/test_cmdline/test_cli.py
index 3ad07f7da..1b6c793af 100644
--- a/ipatests/test_cmdline/test_cli.py
+++ b/ipatests/test_cmdline/test_cli.py
@@ -1,10 +1,10 @@
 import shlex
 import sys
 import contextlib
-import StringIO
 
 import nose
 import six
+from six import StringIO
 
 from ipatests import util
 from ipalib import api, errors
@@ -41,7 +41,7 @@ class TestCLIParsing(object):
     def fake_stdin(self, string_in):
         """Context manager that temporarily replaces stdin to read a string"""
         old_stdin = sys.stdin
-        sys.stdin = StringIO.StringIO(string_in)
+        sys.stdin = StringIO(string_in)
         yield
         sys.stdin = old_stdin
 
diff --git a/ipatests/test_cmdline/test_help.py b/ipatests/test_cmdline/test_help.py
index 2c0db3288..cdbfd8ea9 100644
--- a/ipatests/test_cmdline/test_help.py
+++ b/ipatests/test_cmdline/test_help.py
@@ -19,10 +19,10 @@
 
 import sys
 import contextlib
-import StringIO
 
 from nose.tools import assert_raises  # pylint: disable=E0611
 import six
+from six import StringIO
 
 from ipalib import api, errors
 from ipalib.plugins.user import user_add
@@ -45,8 +45,8 @@ class CLITestContext(object):
 
     def __enter__(self):
         self.old_streams = sys.stdout, sys.stderr
-        self.stdout_fileobj = sys.stdout = StringIO.StringIO()
-        self.stderr_fileobj = sys.stderr = StringIO.StringIO()
+        self.stdout_fileobj = sys.stdout = StringIO()
+        self.stderr_fileobj = sys.stderr = StringIO()
         return self
 
     def __exit__(self, exc_type, exc_value, traceback):