From b4c7433cc46eb0460c885eff5ed5259b5cb7d8f0 Mon Sep 17 00:00:00 2001
From: Tomas Kopecek <tkopecek@redhat.com>
Date: Wed, 3 May 2017 15:07:11 +0200
Subject: [PATCH] StringIO to six

---
 koji/daemon.py                                |  4 +-
 tests/test_cli/test_add_group.py              | 14 +++---
 tests/test_cli/test_add_host.py               | 17 +++-----
 tests/test_cli/test_add_host_to_channel.py    | 19 ++++----
 tests/test_cli/test_add_pkg.py                | 22 ++++------
 tests/test_cli/test_block_pkg.py              | 18 +++-----
 tests/test_cli/test_build.py                  | 43 +++++++++----------
 tests/test_cli/test_chain_build.py            | 39 ++++++++---------
 tests/test_cli/test_edit_host.py              | 18 +++-----
 tests/test_cli/test_edit_tag.py               | 17 +++-----
 tests/test_cli/test_import_comps.py           | 22 +++++-----
 tests/test_cli/test_list_commands.py          | 13 +++---
 tests/test_cli/test_maven_build.py            | 39 ++++++++---------
 tests/test_cli/test_remove_channel.py         | 15 +++----
 .../test_cli/test_remove_host_from_channel.py | 15 +++----
 tests/test_cli/test_remove_pkg.py             | 20 ++++-----
 tests/test_cli/test_rename_channel.py         | 13 +++---
 tests/test_cli/test_runroot.py                |  5 +--
 tests/test_cli/test_save_failed_tree.py       |  4 +-
 .../test_cli/test_upload_progress_callback.py |  4 +-
 tests/test_cli/test_watch_tasks.py            |  8 ++--
 tests/test_plugins/test_protonmsg.py          |  6 +--
 tests/test_tasks.py                           |  5 +--
 23 files changed, 165 insertions(+), 215 deletions(-)

diff --git a/koji/daemon.py b/koji/daemon.py
index 82c5c4c6..45a14c58 100644
--- a/koji/daemon.py
+++ b/koji/daemon.py
@@ -29,7 +29,6 @@ from koji.util import md5_constructor, adler32_constructor, parseStatus
 import os
 import signal
 import logging
-import urlparse
 from fnmatch import fnmatch
 import base64
 import time
@@ -38,6 +37,7 @@ import traceback
 import errno
 import six.moves.xmlrpc_client
 from six.moves import range
+import six.moves.urllib
 import six
 
 
@@ -247,7 +247,7 @@ class SCM(object):
 
         # replace the scheme with http:// so that the urlparse works in all cases
         dummyurl = self.url.replace(scheme, 'http://', 1)
-        dummyscheme, netloc, path, params, query, fragment = urlparse.urlparse(dummyurl)
+        dummyscheme, netloc, path, params, query, fragment = six.moves.urllib.parse.urlparse(dummyurl)
 
         user = None
         userhost = netloc.split('@')
diff --git a/tests/test_cli/test_add_group.py b/tests/test_cli/test_add_group.py
index f2d4aed7..d2899c7b 100644
--- a/tests/test_cli/test_add_group.py
+++ b/tests/test_cli/test_add_group.py
@@ -1,13 +1,13 @@
 from __future__ import absolute_import
 import unittest
 
-import StringIO as stringio
 
 import os
 
 import sys
 
 import mock
+import six
 
 from . import loadcli
 
@@ -19,7 +19,7 @@ class TestAddGroup(unittest.TestCase):
     # Show long diffs in error output...
     maxDiff = None
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_add_group(self, activate_session_mock, stdout):
         tag = 'tag'
@@ -48,7 +48,7 @@ class TestAddGroup(unittest.TestCase):
         session.groupListAdd.assert_called_once_with(tag, group)
         self.assertNotEqual(rv, 1)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_add_group_dupl(self, activate_session_mock, stdout):
         tag = 'tag'
@@ -77,8 +77,8 @@ class TestAddGroup(unittest.TestCase):
         session.groupListAdd.assert_not_called()
         self.assertEqual(rv, 1)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
-    @mock.patch('sys.stderr', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
+    @mock.patch('sys.stderr', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_add_group_help(
             self,
@@ -114,7 +114,7 @@ class TestAddGroup(unittest.TestCase):
         session.groupListAdd.assert_not_called()
         self.assertEqual(cm.exception.code, 2)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_add_group_no_perm(self, activate_session_mock, stdout):
         tag = 'tag'
@@ -140,7 +140,7 @@ class TestAddGroup(unittest.TestCase):
         session.groupListAdd.assert_not_called()
         self.assertEqual(rv, 1)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_add_group_no_tag(self, activate_session_mock, stdout):
         tag = 'tag'
diff --git a/tests/test_cli/test_add_host.py b/tests/test_cli/test_add_host.py
index a7ecf7db..026c4fad 100644
--- a/tests/test_cli/test_add_host.py
+++ b/tests/test_cli/test_add_host.py
@@ -1,13 +1,10 @@
 from __future__ import absolute_import
 import unittest
 
-import StringIO as stringio
-
 import os
-
 import sys
-
 import mock
+import six
 
 from . import loadcli
 
@@ -19,7 +16,7 @@ class TestAddHost(unittest.TestCase):
     # Show long diffs in error output...
     maxDiff = None
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_add_host(self, activate_session_mock, stdout):
         host = 'host'
@@ -49,7 +46,7 @@ class TestAddHost(unittest.TestCase):
         session.addHost.assert_called_once_with(host, arches, **kwargs)
         self.assertNotEqual(rv, 1)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_add_host_no_krb_principal(
             self, activate_session_mock, stdout):
@@ -76,7 +73,7 @@ class TestAddHost(unittest.TestCase):
         session.addHost.assert_called_once_with(host, arches)
         self.assertNotEqual(rv, 1)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_add_host_dupl(self, activate_session_mock, stdout):
         host = 'host'
@@ -103,8 +100,8 @@ class TestAddHost(unittest.TestCase):
         session.addHost.assert_not_called()
         self.assertEqual(rv, 1)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
-    @mock.patch('sys.stderr', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
+    @mock.patch('sys.stderr', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_add_host_help(self, activate_session_mock, stderr, stdout):
         arguments = []
@@ -134,7 +131,7 @@ class TestAddHost(unittest.TestCase):
         session.addHost.assert_not_called()
         self.assertEqual(cm.exception.code, 2)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_add_host_failed(self, activate_session_mock, stdout):
         host = 'host'
diff --git a/tests/test_cli/test_add_host_to_channel.py b/tests/test_cli/test_add_host_to_channel.py
index 71978365..5daabe1e 100644
--- a/tests/test_cli/test_add_host_to_channel.py
+++ b/tests/test_cli/test_add_host_to_channel.py
@@ -1,13 +1,10 @@
 from __future__ import absolute_import
 import unittest
 
-import StringIO as stringio
-
 import os
-
 import sys
-
 import mock
+import six
 
 from . import loadcli
 
@@ -19,7 +16,7 @@ class TestAddHostToChannel(unittest.TestCase):
     # Show long diffs in error output...
     maxDiff = None
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_add_host_to_channel(self, activate_session_mock, stdout):
         host = 'host'
@@ -48,7 +45,7 @@ class TestAddHostToChannel(unittest.TestCase):
         session.addHostToChannel.assert_called_once_with(host, channel)
         self.assertNotEqual(rv, 1)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_add_host_to_channel_list(
             self, activate_session_mock, stdout):
@@ -76,7 +73,7 @@ class TestAddHostToChannel(unittest.TestCase):
         session.addHostToChannel.assert_not_called()
         self.assertNotEqual(rv, 1)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_add_host_to_channel_new(
             self, activate_session_mock, stdout):
@@ -107,7 +104,7 @@ class TestAddHostToChannel(unittest.TestCase):
             host, channel, **kwargs)
         self.assertNotEqual(rv, 1)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_add_host_to_channel_no_channel(
             self, activate_session_mock, stdout):
@@ -135,7 +132,7 @@ class TestAddHostToChannel(unittest.TestCase):
         session.addHostToChannel.assert_not_called()
         self.assertEqual(rv, 1)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_add_host_to_channel_no_host(
             self, activate_session_mock, stdout):
@@ -165,8 +162,8 @@ class TestAddHostToChannel(unittest.TestCase):
         session.addHostToChannel.assert_not_called()
         self.assertEqual(rv, 1)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
-    @mock.patch('sys.stderr', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
+    @mock.patch('sys.stderr', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_add_host_to_channel_help(
             self, activate_session_mock, stderr, stdout):
diff --git a/tests/test_cli/test_add_pkg.py b/tests/test_cli/test_add_pkg.py
index 909e1fdf..93965c8d 100644
--- a/tests/test_cli/test_add_pkg.py
+++ b/tests/test_cli/test_add_pkg.py
@@ -1,14 +1,10 @@
 from __future__ import absolute_import
 import unittest
 
-
-import StringIO as stringio
-
 import os
-
 import sys
-
 import mock
+import six
 
 from mock import call
 
@@ -22,7 +18,7 @@ class TestAddPkg(unittest.TestCase):
     # Show long diffs in error output...
     maxDiff = None
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_add_pkg(self, activate_session_mock, stdout):
         tag = 'tag'
@@ -67,7 +63,7 @@ class TestAddPkg(unittest.TestCase):
         session.multiCall.assert_called_once_with(strict=True)
         self.assertNotEqual(rv, 1)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_add_pkg_multi_pkg(self, activate_session_mock, stdout):
         tag = 'tag'
@@ -111,7 +107,7 @@ class TestAddPkg(unittest.TestCase):
                           call.multiCall(strict=True)])
         self.assertNotEqual(rv, 1)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_add_pkg_owner_no_exists(
             self, activate_session_mock, stdout):
@@ -144,7 +140,7 @@ class TestAddPkg(unittest.TestCase):
                          [call.getUser(owner)])
         self.assertEqual(rv, 1)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_add_pkg_tag_no_exists(self, activate_session_mock, stdout):
         tag = 'tag'
@@ -180,8 +176,8 @@ class TestAddPkg(unittest.TestCase):
                           call.getTag(tag)])
         self.assertEqual(cm.exception.code, 1)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
-    @mock.patch('sys.stderr', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
+    @mock.patch('sys.stderr', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_add_pkg_no_owner(
             self, activate_session_mock, stderr, stdout):
@@ -218,8 +214,8 @@ class TestAddPkg(unittest.TestCase):
         session.packageListAdd.assert_not_called()
         self.assertEqual(cm.exception.code, 2)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
-    @mock.patch('sys.stderr', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
+    @mock.patch('sys.stderr', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_add_pkg_no_arg(
             self, activate_session_mock, stderr, stdout):
diff --git a/tests/test_cli/test_block_pkg.py b/tests/test_cli/test_block_pkg.py
index f5219091..7b006152 100644
--- a/tests/test_cli/test_block_pkg.py
+++ b/tests/test_cli/test_block_pkg.py
@@ -1,14 +1,10 @@
 from __future__ import absolute_import
 import unittest
 
-
-import StringIO as stringio
-
 import os
-
 import sys
-
 import mock
+import six
 
 from mock import call
 
@@ -22,7 +18,7 @@ class TestBlockPkg(unittest.TestCase):
     # Show long diffs in error output...
     maxDiff = None
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_block_pkg(self, activate_session_mock, stdout):
         tag = 'tag'
@@ -54,7 +50,7 @@ class TestBlockPkg(unittest.TestCase):
         session.multiCall.assert_called_once_with(strict=True)
         self.assertNotEqual(rv, 1)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_block_pkg_multi_pkg(self, activate_session_mock, stdout):
         tag = 'tag'
@@ -92,7 +88,7 @@ class TestBlockPkg(unittest.TestCase):
                             strict=True)])
         self.assertNotEqual(rv, 1)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_block_pkg_no_package(self, activate_session_mock, stdout):
         tag = 'tag'
@@ -125,7 +121,7 @@ class TestBlockPkg(unittest.TestCase):
         session.multiCall.assert_not_called()
         self.assertEqual(rv, 1)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_block_pkg_tag_no_exists(
             self, activate_session_mock, stdout):
@@ -153,8 +149,8 @@ class TestBlockPkg(unittest.TestCase):
         session.packageListBlock.assert_not_called()
         self.assertEqual(rv, 1)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
-    @mock.patch('sys.stderr', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
+    @mock.patch('sys.stderr', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_block_pkg_help(
             self, activate_session_mock, stderr, stdout):
diff --git a/tests/test_cli/test_build.py b/tests/test_cli/test_build.py
index 306df0b7..2a10f443 100644
--- a/tests/test_cli/test_build.py
+++ b/tests/test_cli/test_build.py
@@ -1,13 +1,10 @@
 from __future__ import absolute_import
 import unittest
 
-import StringIO as stringio
-
 import os
-
 import sys
-
 import mock
+import six
 
 from . import loadcli
 
@@ -26,7 +23,7 @@ class TestBuild(unittest.TestCase):
         # Mock out the xmlrpc server
         self.session = mock.MagicMock()
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     @mock.patch('koji_cli._unique_path', return_value='random_path')
     @mock.patch('koji_cli._running_in_bg', return_value=False)
@@ -77,7 +74,7 @@ Task info: weburl/taskinfo?taskID=1
             self.session, [task_id], quiet=self.options.quiet)
         self.assertEqual(rv, 0)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     @mock.patch('koji_cli._unique_path', return_value='random_path')
     @mock.patch('koji_cli._running_in_bg', return_value=False)
@@ -125,8 +122,8 @@ Task info: weburl/taskinfo?taskID=1
             self.session, [task_id], quiet=self.options.quiet)
         self.assertEqual(rv, 0)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
-    @mock.patch('sys.stderr', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
+    @mock.patch('sys.stderr', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     @mock.patch('koji_cli._unique_path', return_value='random_path')
     @mock.patch('koji_cli._running_in_bg', return_value=False)
@@ -168,8 +165,8 @@ Task info: weburl/taskinfo?taskID=1
         watch_tasks_mock.assert_not_called()
         self.assertEqual(cm.exception.code, 2)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
-    @mock.patch('sys.stderr', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
+    @mock.patch('sys.stderr', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     @mock.patch('koji_cli._unique_path', return_value='random_path')
     @mock.patch('koji_cli._running_in_bg', return_value=False)
@@ -222,8 +219,8 @@ Options:
         watch_tasks_mock.assert_not_called()
         self.assertEqual(cm.exception.code, 0)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
-    @mock.patch('sys.stderr', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
+    @mock.patch('sys.stderr', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     @mock.patch('koji_cli._unique_path', return_value='random_path')
     @mock.patch('koji_cli._running_in_bg', return_value=False)
@@ -268,7 +265,7 @@ Options:
         watch_tasks_mock.assert_not_called()
         self.assertEqual(cm.exception.code, 2)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     @mock.patch('koji_cli._unique_path', return_value='random_path')
     @mock.patch('koji_cli._running_in_bg', return_value=False)
@@ -313,7 +310,7 @@ Task info: weburl/taskinfo?taskID=1
             self.session, [task_id], quiet=self.options.quiet)
         self.assertEqual(rv, 0)
 
-    @mock.patch('sys.stderr', new_callable=stringio.StringIO)
+    @mock.patch('sys.stderr', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     @mock.patch('koji_cli._unique_path', return_value='random_path')
     @mock.patch('koji_cli._running_in_bg', return_value=False)
@@ -357,7 +354,7 @@ Task info: weburl/taskinfo?taskID=1
         watch_tasks_mock.assert_not_called()
         self.assertEqual(cm.exception.code, 2)
 
-    @mock.patch('sys.stderr', new_callable=stringio.StringIO)
+    @mock.patch('sys.stderr', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     @mock.patch('koji_cli._unique_path', return_value='random_path')
     @mock.patch('koji_cli._running_in_bg', return_value=False)
@@ -405,7 +402,7 @@ Task info: weburl/taskinfo?taskID=1
         watch_tasks_mock.assert_not_called()
         self.assertEqual(cm.exception.code, 2)
 
-    @mock.patch('sys.stderr', new_callable=stringio.StringIO)
+    @mock.patch('sys.stderr', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     @mock.patch('koji_cli._unique_path', return_value='random_path')
     @mock.patch('koji_cli._running_in_bg', return_value=False)
@@ -453,7 +450,7 @@ Task info: weburl/taskinfo?taskID=1
         watch_tasks_mock.assert_not_called()
         self.assertEqual(cm.exception.code, 2)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     @mock.patch('koji_cli._unique_path', return_value='random_path')
     @mock.patch('koji_cli._running_in_bg', return_value=False)
@@ -508,7 +505,7 @@ Task info: weburl/taskinfo?taskID=1
             self.session, [task_id], quiet=self.options.quiet)
         self.assertEqual(rv, 0)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     @mock.patch('koji_cli._unique_path', return_value='random_path')
     @mock.patch('koji_cli._running_in_bg', return_value=False)
@@ -556,7 +553,7 @@ Task info: weburl/taskinfo?taskID=1
             self.session, [task_id], quiet=self.options.quiet)
         self.assertEqual(rv, 0)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     @mock.patch('koji_cli._unique_path', return_value='random_path')
     @mock.patch('koji_cli._running_in_bg', return_value=True)
@@ -607,7 +604,7 @@ Task info: weburl/taskinfo?taskID=1
         watch_tasks_mock.assert_not_called()
         self.assertIsNone(rv)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     @mock.patch('koji_cli._unique_path', return_value='random_path')
     @mock.patch('koji_cli._running_in_bg', return_value=False)
@@ -659,7 +656,7 @@ Task info: weburl/taskinfo?taskID=1
             self.session, [task_id], quiet=self.options.quiet)
         self.assertEqual(rv, 0)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     @mock.patch('koji_cli._unique_path', return_value='random_path')
     @mock.patch('koji_cli._running_in_bg', return_value=False)
@@ -708,7 +705,7 @@ Task info: weburl/taskinfo?taskID=1
             self.session, [task_id], quiet=quiet)
         self.assertEqual(rv, 0)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     @mock.patch('koji_cli._unique_path', return_value='random_path')
     @mock.patch('koji_cli._running_in_bg', return_value=False)
@@ -761,7 +758,7 @@ Task info: weburl/taskinfo?taskID=1
             self.session, [task_id], quiet=self.options.quiet)
         self.assertEqual(rv, 0)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     @mock.patch('koji_cli._unique_path', return_value='random_path')
     @mock.patch('koji_cli._running_in_bg', return_value=False)
diff --git a/tests/test_cli/test_chain_build.py b/tests/test_cli/test_chain_build.py
index 61449f76..9ded5e67 100644
--- a/tests/test_cli/test_chain_build.py
+++ b/tests/test_cli/test_chain_build.py
@@ -1,13 +1,10 @@
 from __future__ import absolute_import
 import unittest
 
-import StringIO as stringio
-
 import os
-
 import sys
-
 import mock
+import six
 
 from . import loadcli
 
@@ -26,7 +23,7 @@ class TestChainBuild(unittest.TestCase):
         # Mock out the xmlrpc server
         self.session = mock.MagicMock()
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     @mock.patch('koji_cli._running_in_bg', return_value=False)
     @mock.patch('koji_cli.watch_tasks', return_value=0)
@@ -85,8 +82,8 @@ Task info: weburl/taskinfo?taskID=1
             self.session, [task_id], quiet=self.options.quiet)
         self.assertEqual(rv, 0)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
-    @mock.patch('sys.stderr', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
+    @mock.patch('sys.stderr', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     @mock.patch('koji_cli._running_in_bg', return_value=False)
     @mock.patch('koji_cli.watch_tasks', return_value=0)
@@ -125,8 +122,8 @@ Task info: weburl/taskinfo?taskID=1
         watch_tasks_mock.assert_not_called()
         self.assertEqual(cm.exception.code, 2)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
-    @mock.patch('sys.stderr', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
+    @mock.patch('sys.stderr', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     @mock.patch('koji_cli._running_in_bg', return_value=False)
     @mock.patch('koji_cli.watch_tasks', return_value=0)
@@ -169,7 +166,7 @@ Options:
         watch_tasks_mock.assert_not_called()
         self.assertEqual(cm.exception.code, 0)
 
-    @mock.patch('sys.stderr', new_callable=stringio.StringIO)
+    @mock.patch('sys.stderr', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     @mock.patch('koji_cli._running_in_bg', return_value=False)
     @mock.patch('koji_cli.watch_tasks', return_value=0)
@@ -218,7 +215,7 @@ Options:
         watch_tasks_mock.assert_not_called()
         self.assertEqual(cm.exception.code, 2)
 
-    @mock.patch('sys.stderr', new_callable=stringio.StringIO)
+    @mock.patch('sys.stderr', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     @mock.patch('koji_cli._running_in_bg', return_value=False)
     @mock.patch('koji_cli.watch_tasks', return_value=0)
@@ -277,7 +274,7 @@ Options:
         watch_tasks_mock.assert_not_called()
         self.assertEqual(cm.exception.code, 2)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     @mock.patch('koji_cli._running_in_bg', return_value=False)
     @mock.patch('koji_cli.watch_tasks', return_value=0)
@@ -364,7 +361,7 @@ Target target is not usable for a chain-build
         self.session.getBuildTarget.return_value = target_info
         self.session.getTag.return_value = dest_tag_info
         self.session.getFullInheritance.return_value = tag_tree
-        with mock.patch('sys.stdout', new_callable=stringio.StringIO) as stdout:
+        with mock.patch('sys.stdout', new_callable=six.StringIO) as stdout:
             # Run it and check immediate output
             # args: target badnvr : http://scm2 http://scm3 n-v-r-1 : n-v-r-2 n-v-r-3
             # expected: failed, src is neither scm nor good n-v-r
@@ -385,7 +382,7 @@ Target target is not usable for a chain-build
             watch_tasks_mock.assert_not_called()
             self.assertEqual(rv, 1)
 
-        with mock.patch('sys.stdout', new_callable=stringio.StringIO) as stdout:
+        with mock.patch('sys.stdout', new_callable=six.StringIO) as stdout:
             source_args = [
                 'path/n-v-r',
                 ':',
@@ -403,7 +400,7 @@ Target target is not usable for a chain-build
             expected = '"path/n-v-r" is not a SCM URL or package N-V-R\n'
             self.assertMultiLineEqual(actual, expected)
 
-        with mock.patch('sys.stdout', new_callable=stringio.StringIO) as stdout:
+        with mock.patch('sys.stdout', new_callable=six.StringIO) as stdout:
             source_args = [
                 'badn-vr',
                 ':',
@@ -421,7 +418,7 @@ Target target is not usable for a chain-build
             expected = '"badn-vr" is not a SCM URL or package N-V-R\n'
             self.assertMultiLineEqual(actual, expected)
 
-        with mock.patch('sys.stdout', new_callable=stringio.StringIO) as stdout:
+        with mock.patch('sys.stdout', new_callable=six.StringIO) as stdout:
             source_args = [
                 'badn-v-r.rpm',
                 ':',
@@ -439,7 +436,7 @@ Target target is not usable for a chain-build
             expected = '"badn-v-r.rpm" is not a SCM URL or package N-V-R\n'
             self.assertMultiLineEqual(actual, expected)
 
-        with mock.patch('sys.stderr', new_callable=stringio.StringIO) as stderr:
+        with mock.patch('sys.stderr', new_callable=six.StringIO) as stderr:
             source_args = ['http://scm']
             args = [target] + source_args
 
@@ -459,7 +456,7 @@ If there are no dependencies, use the build command instead
             self.assertMultiLineEqual(actual, expected)
             self.assertEqual(cm.exception.code, 2)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     @mock.patch('koji_cli._running_in_bg', return_value=False)
     @mock.patch('koji_cli.watch_tasks', return_value=0)
@@ -522,7 +519,7 @@ Task info: weburl/taskinfo?taskID=1
             self.session, [task_id], quiet=self.options.quiet)
         self.assertEqual(rv, 0)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     @mock.patch('koji_cli._running_in_bg', return_value=False)
     @mock.patch('koji_cli.watch_tasks', return_value=0)
@@ -584,7 +581,7 @@ Task info: weburl/taskinfo?taskID=1
             self.session, [task_id], quiet=self.options.quiet)
         self.assertEqual(rv, 0)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     @mock.patch('koji_cli._running_in_bg', return_value=True)
     @mock.patch('koji_cli.watch_tasks', return_value=0)
@@ -646,7 +643,7 @@ Task info: weburl/taskinfo?taskID=1
         watch_tasks_mock.assert_not_called()
         self.assertIsNone(rv)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     @mock.patch('koji_cli._running_in_bg', return_value=False)
     @mock.patch('koji_cli.watch_tasks', return_value=0)
diff --git a/tests/test_cli/test_edit_host.py b/tests/test_cli/test_edit_host.py
index bb86d117..ccf0b7d2 100644
--- a/tests/test_cli/test_edit_host.py
+++ b/tests/test_cli/test_edit_host.py
@@ -1,14 +1,10 @@
 from __future__ import absolute_import
 import unittest
 
-import StringIO as stringio
-
 import os
-
 import sys
-
 import mock
-
+import six
 from mock import call
 
 from . import loadcli
@@ -21,7 +17,7 @@ class TestEditHost(unittest.TestCase):
     # Show long diffs in error output...
     maxDiff = None
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_edit_host(self, activate_session_mock, stdout):
         host = 'host'
@@ -60,7 +56,7 @@ class TestEditHost(unittest.TestCase):
         self.assertEqual(session.multiCall.call_count, 2)
         self.assertNotEqual(rv, 1)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_edit_host_failed(self, activate_session_mock, stdout):
         host = 'host'
@@ -99,7 +95,7 @@ class TestEditHost(unittest.TestCase):
         self.assertEqual(session.multiCall.call_count, 2)
         self.assertNotEqual(rv, 1)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_edit_multi_host(self, activate_session_mock, stdout):
         hosts = ['host1', 'host2']
@@ -145,8 +141,8 @@ class TestEditHost(unittest.TestCase):
                              call.multiCall(strict=True)])
         self.assertNotEqual(rv, 1)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
-    @mock.patch('sys.stderr', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
+    @mock.patch('sys.stderr', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_edit_host_no_arg(
             self, activate_session_mock, stderr, stdout):
@@ -181,7 +177,7 @@ class TestEditHost(unittest.TestCase):
         session.multiCall.assert_not_called()
         self.assertEqual(cm.exception.code, 2)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_edit_host_no_host(self, activate_session_mock, stdout):
         host = 'host'
diff --git a/tests/test_cli/test_edit_tag.py b/tests/test_cli/test_edit_tag.py
index e11c485e..31d62c5a 100644
--- a/tests/test_cli/test_edit_tag.py
+++ b/tests/test_cli/test_edit_tag.py
@@ -1,18 +1,13 @@
 from __future__ import absolute_import
 import unittest
 
-import StringIO as stringio
-
 import os
-
 import sys
-
 import mock
+import six
 
-from mock import call
 
 from . import loadcli
-import six
 
 cli = loadcli.cli
 
@@ -23,7 +18,7 @@ class TestEditTag(unittest.TestCase):
     # Show long diffs in error output...
     maxDiff = None
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_edit_tag(self, activate_session_mock, stdout):
         tag = 'tag'
@@ -100,8 +95,8 @@ class TestEditTag(unittest.TestCase):
         session.editTag2.assert_called_once_with(tag, **opts)
         self.assertEqual(rv, None)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
-    @mock.patch('sys.stderr', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
+    @mock.patch('sys.stderr', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_edit_tag_help(self, activate_session_mock, stderr, stdout):
         args = ['--help']
@@ -147,8 +142,8 @@ Options:
         session.editTag2.assert_not_called()
         self.assertEqual(cm.exception.code, 0)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
-    @mock.patch('sys.stderr', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
+    @mock.patch('sys.stderr', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_edit_tag_no_arg(self, activate_session_mock, stderr, stdout):
         args = []
diff --git a/tests/test_cli/test_import_comps.py b/tests/test_cli/test_import_comps.py
index 5d01f55e..0a5404c7 100644
--- a/tests/test_cli/test_import_comps.py
+++ b/tests/test_cli/test_import_comps.py
@@ -1,10 +1,10 @@
 from __future__ import absolute_import
 import json
 import unittest
-import StringIO as stringio
 import os
 import sys
 import mock
+import six
 from . import loadcli
 
 try:
@@ -23,7 +23,7 @@ class TestImportComps(unittest.TestCase):
     # Show long diffs in error output...
     maxDiff = None
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.libcomps')
     @mock.patch('koji_cli.activate_session')
     @mock.patch('koji_cli._import_comps')
@@ -63,7 +63,7 @@ class TestImportComps(unittest.TestCase):
         mock_import_comps_alt.assert_not_called()
         self.assertNotEqual(rv, 1)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.libcomps', new=None)
     @mock.patch('koji_cli.yumcomps', create=True)
     @mock.patch('koji_cli.activate_session')
@@ -104,7 +104,7 @@ class TestImportComps(unittest.TestCase):
             session, filename, tag, local_options)
         self.assertNotEqual(rv, 1)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.libcomps', new=None)
     @mock.patch('koji_cli.yumcomps', new=None, create=True)
     @mock.patch('koji_cli.activate_session')
@@ -141,7 +141,7 @@ class TestImportComps(unittest.TestCase):
         mock_import_comps_alt.assert_not_called()
         self.assertEqual(rv, 1)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     @mock.patch('koji_cli._import_comps')
     @mock.patch('koji_cli._import_comps_alt')
@@ -176,8 +176,8 @@ class TestImportComps(unittest.TestCase):
         mock_import_comps_alt.assert_not_called()
         self.assertEqual(rv, 1)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
-    @mock.patch('sys.stderr', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
+    @mock.patch('sys.stderr', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     @mock.patch('koji_cli._import_comps')
     @mock.patch('koji_cli._import_comps_alt')
@@ -216,7 +216,7 @@ class TestImportComps(unittest.TestCase):
         self.assertEqual(cm.exception.code, 2)
 
     @unittest.skipIf(libcomps is None, "No libcomps")
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     def test_import_comps_libcomps(self, stdout):
         comps_file = os.path.dirname(__file__) + '/data/comps-example.xml'
         stdout_file = os.path.dirname(
@@ -231,7 +231,7 @@ class TestImportComps(unittest.TestCase):
             stdout)
 
     @unittest.skipIf(libcomps is None, "No libcomps")
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     def test_import_comps_sample_libcomps(self, stdout):
         comps_file = os.path.dirname(__file__) + '/data/comps-sample.xml'
         stdout_file = os.path.dirname(
@@ -246,7 +246,7 @@ class TestImportComps(unittest.TestCase):
             stdout)
 
     @unittest.skipIf(yumcomps is None, "No yum.comps")
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.libcomps', new=None)
     @mock.patch('koji_cli.yumcomps', create=True, new=yumcomps)
     def test_import_comps_yumcomps(self, stdout):
@@ -263,7 +263,7 @@ class TestImportComps(unittest.TestCase):
             stdout)
 
     @unittest.skipIf(yumcomps is None, "No yum.comps")
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.libcomps', new=None)
     @mock.patch('koji_cli.yumcomps', create=True, new=yumcomps)
     def test_import_comps_sample_yumcomps(self, stdout):
diff --git a/tests/test_cli/test_list_commands.py b/tests/test_cli/test_list_commands.py
index b7779eb6..56c0b23f 100644
--- a/tests/test_cli/test_list_commands.py
+++ b/tests/test_cli/test_list_commands.py
@@ -1,11 +1,8 @@
 from __future__ import absolute_import
-import os
-import sys
-import unittest
-
-import StringIO as stringio
-
 import mock
+import os
+import unittest
+import six
 
 from . import loadcli
 cli = loadcli.cli
@@ -27,7 +24,7 @@ class TestListCommands(unittest.TestCase):
     # Show long diffs in error output...
     maxDiff = None
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     def test_list_commands(self, stdout):
         cli.list_commands()
         actual = stdout.getvalue()
@@ -37,7 +34,7 @@ class TestListCommands(unittest.TestCase):
             expected = f.read().decode('ascii')
         self.assertMultiLineEqual(actual, expected)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     def test_handle_admin_help(self, stdout):
         options, arguments = mock.MagicMock(), mock.MagicMock()
         options.admin = True
diff --git a/tests/test_cli/test_maven_build.py b/tests/test_cli/test_maven_build.py
index 3b8b1870..c3a0b070 100644
--- a/tests/test_cli/test_maven_build.py
+++ b/tests/test_cli/test_maven_build.py
@@ -1,13 +1,10 @@
 from __future__ import absolute_import
 import unittest
 
-import StringIO as stringio
-
 import os
-
 import sys
-
 import mock
+import six
 
 from . import loadcli
 import optparse
@@ -46,7 +43,7 @@ class TestMavenBuild(unittest.TestCase):
         # Mock out the xmlrpc server
         self.session = mock.MagicMock()
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     @mock.patch('koji_cli._running_in_bg', return_value=False)
     @mock.patch('koji_cli.watch_tasks', return_value=0)
@@ -87,8 +84,8 @@ Task info: weburl/taskinfo?taskID=1
             self.session, [task_id], quiet=self.options.quiet)
         self.assertEqual(rv, 0)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
-    @mock.patch('sys.stderr', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
+    @mock.patch('sys.stderr', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     @mock.patch('koji_cli._running_in_bg', return_value=False)
     @mock.patch('koji_cli.watch_tasks', return_value=0)
@@ -127,8 +124,8 @@ Task info: weburl/taskinfo?taskID=1
         watch_tasks_mock.assert_not_called()
         self.assertEqual(cm.exception.code, 2)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
-    @mock.patch('sys.stderr', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
+    @mock.patch('sys.stderr', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     @mock.patch('koji_cli._running_in_bg', return_value=False)
     @mock.patch('koji_cli.watch_tasks', return_value=0)
@@ -167,8 +164,8 @@ Task info: weburl/taskinfo?taskID=1
         watch_tasks_mock.assert_not_called()
         self.assertEqual(cm.exception.code, 2)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
-    @mock.patch('sys.stderr', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
+    @mock.patch('sys.stderr', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     @mock.patch('koji_cli._running_in_bg', return_value=False)
     @mock.patch('koji_cli.watch_tasks', return_value=0)
@@ -235,7 +232,7 @@ Options:
         watch_tasks_mock.assert_not_called()
         self.assertEqual(cm.exception.code, 0)
 
-    @mock.patch('sys.stderr', new_callable=stringio.StringIO)
+    @mock.patch('sys.stderr', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     @mock.patch('koji_cli._running_in_bg', return_value=False)
     @mock.patch('koji_cli.watch_tasks', return_value=0)
@@ -276,7 +273,7 @@ Options:
         watch_tasks_mock.assert_not_called()
         self.assertEqual(cm.exception.code, 2)
 
-    @mock.patch('sys.stderr', new_callable=stringio.StringIO)
+    @mock.patch('sys.stderr', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     @mock.patch('koji_cli._running_in_bg', return_value=False)
     @mock.patch('koji_cli.watch_tasks', return_value=0)
@@ -321,7 +318,7 @@ Options:
         watch_tasks_mock.assert_not_called()
         self.assertEqual(cm.exception.code, 2)
 
-    @mock.patch('sys.stderr', new_callable=stringio.StringIO)
+    @mock.patch('sys.stderr', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     @mock.patch('koji_cli._running_in_bg', return_value=False)
     @mock.patch('koji_cli.watch_tasks', return_value=0)
@@ -366,8 +363,8 @@ Options:
         watch_tasks_mock.assert_not_called()
         self.assertEqual(cm.exception.code, 2)
 
-    @mock.patch('sys.stderr', new_callable=stringio.StringIO)
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stderr', new_callable=six.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     @mock.patch(
         'koji.util.parse_maven_param',
@@ -499,7 +496,7 @@ Task info: weburl/taskinfo?taskID=1
         self.session.mavenBuild.assert_not_called()
         self.assertEqual(cm.exception.code, 2)
 
-    @mock.patch('sys.stderr', new_callable=stringio.StringIO)
+    @mock.patch('sys.stderr', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     @mock.patch('koji.util.parse_maven_param')
     @mock.patch('koji.util.maven_opts')
@@ -551,7 +548,7 @@ Task info: weburl/taskinfo?taskID=1
         watch_tasks_mock.assert_not_called()
         self.assertEqual(cm.exception.code, 2)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     @mock.patch('koji.util.parse_maven_param')
     @mock.patch('koji.util.maven_opts', return_value={})
@@ -633,7 +630,7 @@ Task info: weburl/taskinfo?taskID=1
         self.session.mavenBuild.assert_called_once_with(
             source, target, opts, priority=priority)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     @mock.patch('koji_cli._running_in_bg', return_value=False)
     @mock.patch('koji_cli.watch_tasks', return_value=0)
@@ -677,7 +674,7 @@ Task info: weburl/taskinfo?taskID=1
             self.session, [task_id], quiet=self.options.quiet)
         self.assertEqual(rv, 0)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     @mock.patch('koji_cli._running_in_bg', return_value=True)
     @mock.patch('koji_cli.watch_tasks', return_value=0)
@@ -721,7 +718,7 @@ Task info: weburl/taskinfo?taskID=1
         watch_tasks_mock.assert_not_called()
         self.assertIsNone(rv)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     @mock.patch('koji.util.parse_maven_param')
     @mock.patch('koji.util.maven_opts', return_value={})
diff --git a/tests/test_cli/test_remove_channel.py b/tests/test_cli/test_remove_channel.py
index f881c558..8967158a 100644
--- a/tests/test_cli/test_remove_channel.py
+++ b/tests/test_cli/test_remove_channel.py
@@ -1,13 +1,10 @@
 from __future__ import absolute_import
 import unittest
 
-import StringIO as stringio
-
 import os
-
 import sys
-
 import mock
+import six
 
 from . import loadcli
 
@@ -19,7 +16,7 @@ class TestRemoveChannel(unittest.TestCase):
     # Show long diffs in error output...
     maxDiff = None
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_remove_channel(self, activate_session_mock, stdout):
         channel = 'channel'
@@ -44,7 +41,7 @@ class TestRemoveChannel(unittest.TestCase):
         session.removeChannel.assert_called_once_with(channel, force=None)
         self.assertNotEqual(rv, 1)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_remove_channel_force(self, activate_session_mock, stdout):
         channel = 'channel'
@@ -70,7 +67,7 @@ class TestRemoveChannel(unittest.TestCase):
         session.removeChannel.assert_called_once_with(channel, force=True)
         self.assertNotEqual(rv, 1)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_remove_channel_no_channel(
             self, activate_session_mock, stdout):
@@ -96,8 +93,8 @@ class TestRemoveChannel(unittest.TestCase):
         session.removeChannel.assert_not_called()
         self.assertEqual(rv, 1)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
-    @mock.patch('sys.stderr', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
+    @mock.patch('sys.stderr', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_remove_channel_help(
             self, activate_session_mock, stderr, stdout):
diff --git a/tests/test_cli/test_remove_host_from_channel.py b/tests/test_cli/test_remove_host_from_channel.py
index 4a562827..68eb5085 100644
--- a/tests/test_cli/test_remove_host_from_channel.py
+++ b/tests/test_cli/test_remove_host_from_channel.py
@@ -1,13 +1,10 @@
 from __future__ import absolute_import
 import unittest
 
-import StringIO as stringio
-
 import os
-
 import sys
-
 import mock
+import six
 
 from . import loadcli
 
@@ -19,7 +16,7 @@ class TestRemoveHostFromChannel(unittest.TestCase):
     # Show long diffs in error output...
     maxDiff = None
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_remove_host_from_channel(
             self, activate_session_mock, stdout):
@@ -49,7 +46,7 @@ class TestRemoveHostFromChannel(unittest.TestCase):
         session.removeHostFromChannel.assert_called_once_with(host, channel)
         self.assertNotEqual(rv, 1)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_remove_host_from_channel_no_host(
             self, activate_session_mock, stdout):
@@ -77,7 +74,7 @@ class TestRemoveHostFromChannel(unittest.TestCase):
         session.removeHostFromChannel.assert_not_called()
         self.assertEqual(rv, 1)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_remove_host_from_channel_not_a_member(
             self, activate_session_mock, stdout):
@@ -108,8 +105,8 @@ class TestRemoveHostFromChannel(unittest.TestCase):
         session.removeHostFromChannel.assert_not_called()
         self.assertEqual(rv, 1)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
-    @mock.patch('sys.stderr', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
+    @mock.patch('sys.stderr', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_remove_host_from_channel_help(
             self, activate_session_mock, stderr, stdout):
diff --git a/tests/test_cli/test_remove_pkg.py b/tests/test_cli/test_remove_pkg.py
index cad99a06..e21fb6f1 100644
--- a/tests/test_cli/test_remove_pkg.py
+++ b/tests/test_cli/test_remove_pkg.py
@@ -2,14 +2,10 @@ from __future__ import absolute_import
 import unittest
 
 
-import StringIO as stringio
-
 import os
-
 import sys
-
 import mock
-
+import six
 from mock import call
 
 from . import loadcli
@@ -22,7 +18,7 @@ class TestRemovePkg(unittest.TestCase):
     # Show long diffs in error output...
     maxDiff = None
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_remove_pkg(self, activate_session_mock, stdout):
         tag = 'tag'
@@ -55,7 +51,7 @@ class TestRemovePkg(unittest.TestCase):
         session.multiCall.assert_called_once_with(strict=True)
         self.assertNotEqual(rv, 1)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_remove_pkg_multi_pkg(self, activate_session_mock, stdout):
         tag = 'tag'
@@ -94,7 +90,7 @@ class TestRemovePkg(unittest.TestCase):
                             strict=True)])
         self.assertNotEqual(rv, 1)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_remove_pkg_force(self, activate_session_mock, stdout):
         tag = 'tag'
@@ -133,7 +129,7 @@ class TestRemovePkg(unittest.TestCase):
                             strict=True)])
         self.assertNotEqual(rv, 1)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_remove_pkg_no_package(self, activate_session_mock, stdout):
         tag = 'tag'
@@ -166,7 +162,7 @@ class TestRemovePkg(unittest.TestCase):
         session.multiCall.assert_not_called()
         self.assertEqual(rv, 1)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_remove_pkg_tag_no_exists(
             self, activate_session_mock, stdout):
@@ -194,8 +190,8 @@ class TestRemovePkg(unittest.TestCase):
         session.packageListRemove.assert_not_called()
         self.assertEqual(rv, 1)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
-    @mock.patch('sys.stderr', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
+    @mock.patch('sys.stderr', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_remove_pkg_help(
             self, activate_session_mock, stderr, stdout):
diff --git a/tests/test_cli/test_rename_channel.py b/tests/test_cli/test_rename_channel.py
index eca5a087..9b0402da 100644
--- a/tests/test_cli/test_rename_channel.py
+++ b/tests/test_cli/test_rename_channel.py
@@ -1,13 +1,10 @@
 from __future__ import absolute_import
 import unittest
 
-import StringIO as stringio
-
 import os
-
 import sys
-
 import mock
+import six
 
 from . import loadcli
 
@@ -19,7 +16,7 @@ class TestRenameChannel(unittest.TestCase):
     # Show long diffs in error output...
     maxDiff = None
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_rename_channel(self, activate_session_mock, stdout):
         old_name = 'old_name'
@@ -45,7 +42,7 @@ class TestRenameChannel(unittest.TestCase):
         session.renameChannel.assert_called_once_with(old_name, new_name)
         self.assertNotEqual(rv, 1)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_rename_channel_no_channel(
             self, activate_session_mock, stdout):
@@ -72,8 +69,8 @@ class TestRenameChannel(unittest.TestCase):
         session.renameChannel.assert_not_called()
         self.assertEqual(rv, 1)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
-    @mock.patch('sys.stderr', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
+    @mock.patch('sys.stderr', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     def test_handle_rename_channel_help(
             self, activate_session_mock, stderr, stdout):
diff --git a/tests/test_cli/test_runroot.py b/tests/test_cli/test_runroot.py
index b056105a..9b1392c4 100644
--- a/tests/test_cli/test_runroot.py
+++ b/tests/test_cli/test_runroot.py
@@ -3,8 +3,7 @@ import os
 import sys
 import unittest
 import koji
-
-import StringIO as stringio
+import six
 
 import mock
 
@@ -30,7 +29,7 @@ class TestListCommands(unittest.TestCase):
     # Show long diffs in error output...
     maxDiff = None
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     def test_handle_runroot(self, stdout):
         tag = 'tag'
         arch = 'arch'
diff --git a/tests/test_cli/test_save_failed_tree.py b/tests/test_cli/test_save_failed_tree.py
index 6b1dcfee..cdb89274 100644
--- a/tests/test_cli/test_save_failed_tree.py
+++ b/tests/test_cli/test_save_failed_tree.py
@@ -1,8 +1,8 @@
 from __future__ import absolute_import
-import StringIO
 import unittest
 import koji
 import mock
+import six
 
 from . import loadcli
 cli = loadcli.cli
@@ -127,7 +127,7 @@ class TestSaveFailedTree(unittest.TestCase):
         watch_tasks_mock.assert_called_once_with(self.session, [spawned_id],
                                                  quiet=options.quiet)
 
-    @mock.patch('sys.stdout', new_callable=StringIO.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.activate_session')
     @mock.patch('koji_cli.watch_tasks')
     def test_handle_save_failed_tree_errors(self, watch_tasks_mock, activate_session_mock, stdout):
diff --git a/tests/test_cli/test_upload_progress_callback.py b/tests/test_cli/test_upload_progress_callback.py
index aa1a8f2b..5f0823dd 100644
--- a/tests/test_cli/test_upload_progress_callback.py
+++ b/tests/test_cli/test_upload_progress_callback.py
@@ -2,7 +2,7 @@ from __future__ import absolute_import
 import unittest
 import mock
 import sys
-import StringIO as stringio
+import six
 
 from . import loadcli
 
@@ -31,7 +31,7 @@ class TestUploadProgressCallBack(unittest.TestCase):
         self.assertEqual(cli._format_secs(4321), '01:12:01')
         self.assertEqual(cli._format_secs(4321.567), '01:12:01')
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     def test_progress_callback(self, stdout):
         cli._progress_callback(12300, 234000, 5670, 80, 900)
         cli._progress_callback(45600, 234000, 5670, 0, 900)
diff --git a/tests/test_cli/test_watch_tasks.py b/tests/test_cli/test_watch_tasks.py
index df5349d1..f967c8a8 100644
--- a/tests/test_cli/test_watch_tasks.py
+++ b/tests/test_cli/test_watch_tasks.py
@@ -3,7 +3,6 @@ import unittest
 
 import os
 import sys
-import StringIO as stringio
 
 import mock
 
@@ -11,6 +10,7 @@ from mock import call
 
 from . import loadcli
 from six.moves import range
+import six
 
 cli = loadcli.cli
 
@@ -32,7 +32,7 @@ class TestWatchTasks(unittest.TestCase):
     # Show long diffs in error output...
     maxDiff = None
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     def test_watch_tasks_no_tasklist(self, stdout):
         returned = cli.watch_tasks(self.session, [])
         actual = stdout.getvalue()
@@ -40,7 +40,7 @@ class TestWatchTasks(unittest.TestCase):
         self.assertIsNone(returned)
         self.assertEqual(actual, expected)
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.TaskWatcher')
     @mock.patch('koji_cli.display_tasklist_status')
     @mock.patch('koji_cli.display_task_results')
@@ -170,7 +170,7 @@ class TestWatchTasks(unittest.TestCase):
                           call.display_task_results_mock({0: tw1, 1: tw2, 11: manager.tw11, 12: manager.tw12})
                           ])
 
-    @mock.patch('sys.stdout', new_callable=stringio.StringIO)
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
     @mock.patch('koji_cli.TaskWatcher')
     @mock.patch('koji_cli.display_tasklist_status')
     @mock.patch('koji_cli.display_task_results')
diff --git a/tests/test_plugins/test_protonmsg.py b/tests/test_plugins/test_protonmsg.py
index 442be5ff..e73da5a8 100644
--- a/tests/test_plugins/test_protonmsg.py
+++ b/tests/test_plugins/test_protonmsg.py
@@ -4,8 +4,8 @@ from mock import patch, MagicMock
 import protonmsg
 from koji.context import context
 import tempfile
-from StringIO import StringIO
 from six.moves.configparser import SafeConfigParser
+import six
 
 class TestProtonMsg(unittest.TestCase):
     def tearDown(self):
@@ -205,7 +205,7 @@ send_timeout = 60
 
 class TestTimeoutHandler(unittest.TestCase):
     def setUp(self):
-        confdata = StringIO("""[broker]
+        confdata = six.StringIO("""[broker]
 urls = amqps://broker1.example.com:5671 amqps://broker2.example.com:5671
 cert = /etc/koji-hub/plugins/client.pem
 cacert = /etc/koji-hub/plugins/ca.pem
@@ -228,7 +228,7 @@ send_timeout = 60
 
     @patch('protonmsg.SSLDomain')
     def test_on_start_no_ssl(self, SSLDomain):
-        confdata = StringIO("""[broker]
+        confdata = six.StringIO("""[broker]
 urls = amqp://broker1.example.com:5672 amqp://broker2.example.com:5672
 topic_prefix = koji
 connect_timeout = 10
diff --git a/tests/test_tasks.py b/tests/test_tasks.py
index 3d52855e..551cb054 100644
--- a/tests/test_tasks.py
+++ b/tests/test_tasks.py
@@ -1,6 +1,5 @@
 from __future__ import absolute_import
 import random
-from io import StringIO
 from os import path, makedirs
 from shutil import rmtree
 from tempfile import gettempdir
@@ -17,7 +16,7 @@ import six
 def get_fake_mounts_file():
     """ Returns contents of /prc/mounts in a file-like object
     """
-    return StringIO(six.text_type((
+    return six.StringIO(six.text_type((
         'sysfs /sys sysfs rw,seclabel,nosuid,nodev,noexec,relatime 0 0\n'
         'proc /proc proc rw,nosuid,nodev,noexec,relatime 0 0\n'
         'devtmpfs /dev devtmpfs rw,seclabel,nosuid,size=238836k,nr_inodes=59709,mode=755 0 0\n'
@@ -462,7 +461,7 @@ class TasksTestCase(TestCase):
         obj = TestTask(123, 'some_method', ['random_arg'], None, options, temp_path)
         self.assertEquals(obj.localPath('test.txt'), dummy_file)
 
-    @patch('six.moves.urllib.request.urlopen', return_value=StringIO(six.text_type('Important things\nSome more important things\n')))
+    @patch('six.moves.urllib.request.urlopen', return_value=six.StringIO(six.text_type('Important things\nSome more important things\n')))
     def test_BaseTaskHandler_localPath_no_file(self, mock_urlopen):
         """
         """