Merge "Fix cString ImportError for py34"

tackerclient/tests/unit/test_cli10.py

@@ -17,7 +17,6 @@
 import urllib
 
 import contextlib
-import cStringIO
 import fixtures
 import mox
 import six
@@ -39,7 +38,7 @@ ENDURL = 'localurl'
 
 @contextlib.contextmanager
 def capture_std_streams():
-    fake_stdout, fake_stderr = cStringIO.StringIO(), cStringIO.StringIO()
+    fake_stdout, fake_stderr = six.StringIO(), six.StringIO()
     stdout, stderr = sys.stdout, sys.stderr
     try:
         sys.stdout, sys.stderr = fake_stdout, fake_stderr

tackerclient/tests/unit/test_shell.py

@@ -14,10 +14,10 @@
 #    under the License.
 
 import argparse
-import cStringIO
 import logging
 import os
 import re
+import six
 import sys
 
 import fixtures
@@ -61,8 +61,8 @@ class ShellTest(testtools.TestCase):
         clean_env = {}
         _old_env, os.environ = os.environ, clean_env.copy()
         try:
-            sys.stdout = cStringIO.StringIO()
-            sys.stderr = cStringIO.StringIO()
+            sys.stdout = six.StringIO()
+            sys.stderr = six.StringIO()
             _shell = openstack_shell.TackerShell('1.0')
             _shell.run(argstr.split())
         except SystemExit: