remove unittest2

tests/test_builder/test_build_notification.py

@@ -5,6 +5,7 @@ import locale
 import os
 import tempfile
 import time
+import unittest
 
 import mock
 import six
@@ -13,12 +14,6 @@ import koji
 import koji.util
 from .loadkojid import kojid
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
-
-
 
 class MyClientSession(koji.ClientSession):
 

tests/test_builder/test_choose_taskarch.py

@@ -2,10 +2,7 @@ from __future__ import absolute_import
 import mock
 import rpm
 import tempfile
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 import koji
 from .loadkojid import kojid
 from six.moves import range

tests/test_builder/test_delay_times.py

@@ -1,9 +1,6 @@
 from __future__ import absolute_import
 import mock
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 import koji.daemon
 import koji

tests/test_builder/test_taskparams.py

@@ -1,10 +1,7 @@
 from __future__ import absolute_import
 import inspect
 import mock
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 import koji
 import koji.tasks
 

tests/test_builder/test_volume_id.py

@@ -1,10 +1,7 @@
 from __future__ import absolute_import
 import mock
 import tempfile
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 from .loadkojid import kojid
 import logging
 

tests/test_cli/test_activate_session.py

@@ -2,10 +2,7 @@ from __future__ import absolute_import
 import mock
 import shutil
 import tempfile
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji_cli.lib import activate_session
 

tests/test_cli/test_add_group.py

@@ -2,10 +2,7 @@ from __future__ import absolute_import
 
 import mock
 import six
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji_cli.commands import handle_add_group
 from . import utils

tests/test_cli/test_add_group_pkg.py

@@ -1,9 +1,6 @@
 from __future__ import absolute_import
 import mock
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji_cli.commands import handle_add_group_pkg
 from . import utils

tests/test_cli/test_add_group_req.py

@@ -1,9 +1,6 @@
 from __future__ import absolute_import
 import mock
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji_cli.commands import handle_add_group_req
 from . import utils

tests/test_cli/test_add_host_to_channel.py

@@ -4,10 +4,7 @@ import mock
 import os
 import six
 import sys
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji_cli.commands import handle_add_host_to_channel
 from . import utils

tests/test_cli/test_add_notification.py

@@ -1,10 +1,7 @@
 from __future__ import absolute_import
 import koji
 import mock
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 from six.moves import StringIO
 
 from koji_cli.commands import handle_add_notification

tests/test_cli/test_add_pkg.py

@@ -4,10 +4,7 @@ import mock
 import os
 import six
 import sys
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from mock import call
 

tests/test_cli/test_add_tag.py

@@ -1,10 +1,7 @@
 from __future__ import absolute_import
 import mock
 import six
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji_cli.commands import handle_add_tag
 from . import utils

tests/test_cli/test_add_user.py

@@ -1,10 +1,7 @@
 from __future__ import absolute_import
 import mock
 import six
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji_cli.commands import handle_add_user
 from . import utils

tests/test_cli/test_add_volume.py

@@ -1,10 +1,7 @@
 from __future__ import absolute_import
 import mock
 import six
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji_cli.commands import handle_add_volume
 from . import utils

tests/test_cli/test_assign_task.py

@@ -1,12 +1,7 @@
 from __future__ import absolute_import
 import mock
-import os
 import six
-import sys
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 import koji
 from koji_cli.commands import handle_assign_task

tests/test_cli/test_block_group_pkg.py

@@ -1,9 +1,6 @@
 from __future__ import absolute_import
 import mock
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji_cli.commands import handle_block_group_pkg
 from . import utils

tests/test_cli/test_block_group_req.py

@@ -1,9 +1,6 @@
 from __future__ import absolute_import
 import mock
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji_cli.commands import handle_block_group_req
 from . import utils

tests/test_cli/test_call.py

@@ -2,10 +2,7 @@ from __future__ import absolute_import
 import json
 import mock
 import six
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji_cli.commands import handle_call
 from . import utils

tests/test_cli/test_chain_build.py

@@ -4,10 +4,7 @@ import mock
 import os
 import six
 import sys
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji_cli.commands import handle_chain_build
 from . import utils

tests/test_cli/test_clone_tag.py

@@ -4,10 +4,7 @@ import mock
 import six
 from mock import call
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 import koji
 from koji_cli.commands import handle_clone_tag

tests/test_cli/test_disable_host.py

@@ -1,10 +1,7 @@
 from __future__ import absolute_import
 import mock
 import six
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from mock import call
 from koji_cli.commands import handle_disable_host

tests/test_cli/test_disable_user.py

@@ -1,10 +1,7 @@
 from __future__ import absolute_import
 import mock
 import six
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji_cli.commands import handle_disable_user
 from . import utils

tests/test_cli/test_dist_repo.py

@@ -3,10 +3,7 @@ from __future__ import print_function
 import copy
 import mock
 import six
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 
 from koji_cli.commands import handle_dist_repo

tests/test_cli/test_download_file.py

@@ -6,10 +6,7 @@ import tempfile
 import os
 import requests_mock
 import requests
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji_cli.lib import download_file, _download_progress
 

tests/test_cli/test_edit_external_repo.py

@@ -2,10 +2,7 @@
 from __future__ import absolute_import
 import mock
 import six
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 import koji
 from koji_cli.commands import handle_edit_external_repo

tests/test_cli/test_edit_host.py

@@ -3,10 +3,7 @@ import mock
 import os
 import six
 import sys
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from mock import call
 

tests/test_cli/test_edit_notification.py

@@ -1,10 +1,7 @@
 from __future__ import absolute_import
 import koji
 import mock
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 from six.moves import StringIO
 
 from koji_cli.commands import handle_edit_notification

tests/test_cli/test_edit_user.py

@@ -3,10 +3,7 @@ import mock
 import os
 import six
 import sys
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 
 from koji_cli.commands import handle_edit_user

tests/test_cli/test_enable_host.py

@@ -1,10 +1,7 @@
 from __future__ import absolute_import
 import mock
 import six
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from mock import call
 from koji_cli.commands import handle_enable_host

tests/test_cli/test_enable_user.py

@@ -1,10 +1,7 @@
 from __future__ import absolute_import
 import mock
 import six
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji_cli.commands import handle_enable_user
 from . import utils

tests/test_cli/test_grant_cg_access.py

@@ -1,10 +1,7 @@
 from __future__ import absolute_import
 import mock
 import six
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji_cli.commands import handle_grant_cg_access
 from . import utils

tests/test_cli/test_grant_permission.py

@@ -1,10 +1,7 @@
 from __future__ import absolute_import
 import mock
 import six
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji_cli.commands import handle_grant_permission
 from . import utils

tests/test_cli/test_hello.py

@@ -2,10 +2,7 @@
 from __future__ import absolute_import
 import mock
 import six
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 import koji
 from koji_cli.commands import handle_moshimoshi, _printable_unicode

tests/test_cli/test_image_build.py

@@ -2,10 +2,7 @@ from __future__ import absolute_import
 import mock
 import six
 import os
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 import koji
 

tests/test_cli/test_image_build_indirection.py

@@ -1,10 +1,7 @@
 from __future__ import absolute_import
 import mock
 import six
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 import koji
 

tests/test_cli/test_import.py

@@ -2,10 +2,7 @@ from __future__ import absolute_import
 import mock
 import os
 import six
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 import koji
 from koji_cli.commands import handle_import

tests/test_cli/test_import_cg.py

@@ -8,10 +8,7 @@ from . import utils
 
 import os
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 
 class TestImportCG(utils.CliTestCase):

tests/test_cli/test_import_comps.py

@@ -4,10 +4,7 @@ import mock
 import os
 import six
 import sys
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 try:
     import libcomps

tests/test_cli/test_import_sig.py

@@ -5,10 +5,7 @@ import mock
 import random
 import six
 from six.moves import range
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from mock import call
 from koji.util import base64encode

tests/test_cli/test_list_api.py

@@ -1,10 +1,7 @@
 from __future__ import absolute_import
 import mock
 import six
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji_cli.commands import anon_handle_list_api
 from . import utils

tests/test_cli/test_list_channels.py

@@ -1,9 +1,6 @@
 from __future__ import absolute_import
 import mock
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 from six.moves import StringIO
 
 import koji

tests/test_cli/test_list_commands.py

@@ -2,10 +2,7 @@ from __future__ import absolute_import
 import mock
 import os
 import six
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from . import loadcli, utils
 cli = loadcli.cli

tests/test_cli/test_list_groups.py

@@ -2,10 +2,7 @@ from __future__ import absolute_import
 import mock
 import six
 import time
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji_cli.commands import anon_handle_list_groups
 from . import utils

tests/test_cli/test_list_notifications.py

@@ -1,9 +1,6 @@
 from __future__ import absolute_import
 import mock
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 from six.moves import StringIO
 
 import koji

tests/test_cli/test_list_permissions.py

@@ -1,10 +1,7 @@
 from __future__ import absolute_import
 import mock
 import six
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji_cli.commands import handle_list_permissions
 from . import utils

tests/test_cli/test_list_tasks.py

@@ -1,10 +1,7 @@
 from __future__ import absolute_import
 import mock
 import six
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 import koji
 from koji_cli.lib import _list_tasks

tests/test_cli/test_list_volumes.py

@@ -1,10 +1,7 @@
 from __future__ import absolute_import
 import mock
 import six
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji_cli.commands import handle_list_volumes
 from . import utils

tests/test_cli/test_load_plugins.py

@@ -2,10 +2,7 @@ from __future__ import absolute_import
 
 import os
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 import mock
 

tests/test_cli/test_maven_build.py

@@ -5,10 +5,7 @@ import optparse
 import os
 import six
 import sys
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji_cli.commands import handle_maven_build
 from . import utils

tests/test_cli/test_maven_chain.py

@@ -1,10 +1,7 @@
 from __future__ import absolute_import
 import mock
 import six
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji_cli.commands import handle_maven_chain
 from . import utils

tests/test_cli/test_mock_config.py

@@ -1,10 +1,7 @@
 from __future__ import absolute_import
 import mock
 import six
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji_cli.commands import anon_handle_mock_config
 from . import utils

tests/test_cli/test_move_build.py

@@ -1,10 +1,7 @@
 from __future__ import absolute_import
 import mock
 import six
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji_cli.commands import handle_move_build
 from . import utils

tests/test_cli/test_regen_repo.py

@@ -3,10 +3,7 @@ from __future__ import print_function
 import copy
 import mock
 import six
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji_cli.commands import handle_regen_repo
 from . import utils

tests/test_cli/test_remove_channel.py

@@ -3,10 +3,7 @@ import mock
 import os
 import six
 import sys
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji_cli.commands import handle_remove_channel
 from . import utils

tests/test_cli/test_remove_host_from_channel.py

@@ -3,10 +3,7 @@ import mock
 import os
 import six
 import sys
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji_cli.commands import handle_remove_host_from_channel
 from . import utils

tests/test_cli/test_remove_notification.py

@@ -1,10 +1,7 @@
 from __future__ import absolute_import
 import koji
 import mock
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from six.moves import StringIO
 

tests/test_cli/test_remove_pkg.py

@@ -3,10 +3,7 @@ import mock
 import os
 import six
 import sys
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from mock import call
 

tests/test_cli/test_rename_channel.py

@@ -3,10 +3,7 @@ import mock
 import os
 import six
 import sys
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji_cli.commands import handle_rename_channel
 from . import utils

tests/test_cli/test_restart_host.py

@@ -1,10 +1,7 @@
 from __future__ import absolute_import
 import mock
 import six
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 import koji
 from koji_cli.commands import handle_restart_hosts

tests/test_cli/test_resubmit.py

@@ -2,10 +2,7 @@ from __future__ import absolute_import
 from __future__ import print_function
 import mock
 import six
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji_cli.commands import handle_resubmit
 from . import utils

tests/test_cli/test_revoke_cg_access.py

@@ -1,10 +1,7 @@
 from __future__ import absolute_import
 import mock
 import six
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji_cli.commands import handle_revoke_cg_access
 from . import utils

tests/test_cli/test_revoke_permission.py

@@ -1,10 +1,7 @@
 from __future__ import absolute_import
 import mock
 import six
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji_cli.commands import handle_revoke_permission
 from . import utils

tests/test_cli/test_running_in_bg.py

@@ -1,9 +1,6 @@
 from __future__ import absolute_import
 import mock
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji_cli.lib import _running_in_bg
 

tests/test_cli/test_search.py

@@ -1,10 +1,7 @@
 from __future__ import absolute_import
 import mock
 import six
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji_cli.commands import anon_handle_search
 from . import utils

tests/test_cli/test_set_build_volume.py

@@ -1,10 +1,7 @@
 from __future__ import absolute_import
 import mock
 import six
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji_cli.commands import handle_set_build_volume
 from . import utils

tests/test_cli/test_set_pkg_arches.py

@@ -1,10 +1,7 @@
 from __future__ import absolute_import
 import mock
 import six
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji_cli.commands import handle_set_pkg_arches
 from . import utils

tests/test_cli/test_set_pkg_owner.py

@@ -1,10 +1,7 @@
 from __future__ import absolute_import
 import mock
 import six
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji_cli.commands import handle_set_pkg_owner
 from . import utils

tests/test_cli/test_set_task_priority.py

@@ -1,10 +1,7 @@
 from __future__ import absolute_import
 import mock
 import six
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji_cli.commands import handle_set_task_priority
 from . import utils

tests/test_cli/test_spin_commands.py

@@ -2,10 +2,7 @@ from __future__ import absolute_import
 import mock
 import six
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 import koji
 from koji_cli.commands import handle_spin_livecd, handle_spin_livemedia, handle_spin_appliance, _build_image

tests/test_cli/test_tag_build.py

@@ -1,10 +1,7 @@
 from __future__ import absolute_import
 import mock
 import six
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji_cli.commands import handle_tag_build
 from . import utils

tests/test_cli/test_taskinfo.py

@@ -3,10 +3,7 @@ import collections
 import mock
 import six
 import time
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 import koji
 from koji_cli.commands import anon_handle_taskinfo, \

tests/test_cli/test_unblock_group_pkg.py

@@ -1,9 +1,6 @@
 from __future__ import absolute_import
 import mock
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji_cli.commands import handle_unblock_group_pkg
 from . import utils

tests/test_cli/test_unblock_group_req.py

@@ -1,9 +1,6 @@
 from __future__ import absolute_import
 import mock
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji_cli.commands import handle_unblock_group_req
 from . import utils

tests/test_cli/test_unblock_pkg.py

@@ -1,10 +1,7 @@
 from __future__ import absolute_import
 import mock
 import six
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 
 from koji_cli.commands import handle_unblock_pkg

tests/test_cli/test_unique_path.py

@@ -1,8 +1,5 @@
 from __future__ import absolute_import
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from six.moves import range
 

tests/test_cli/test_upload_progress_callback.py

@@ -1,10 +1,7 @@
 from __future__ import absolute_import
 import mock
 import six
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 
 from koji_cli.lib import _format_size, _format_secs, _progress_callback

tests/test_cli/test_wait_repo.py

@@ -3,10 +3,7 @@ from __future__ import print_function
 import copy
 import mock
 import six
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji_cli.commands import anon_handle_wait_repo
 from . import utils

tests/test_cli/test_watch_tasks.py

@@ -4,10 +4,7 @@ import mock
 import os
 import six
 import sys
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from mock import call
 from six.moves import range

tests/test_cli/test_wrapper_rpm.py

@@ -1,10 +1,7 @@
 from __future__ import absolute_import
 import mock
 import six
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji_cli.commands import handle_wrapper_rpm
 from . import utils

tests/test_cli/test_write_signed_rpm.py

@@ -2,10 +2,7 @@ from __future__ import absolute_import
 import hashlib
 import mock
 import six
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from mock import call
 import koji

tests/test_cli/utils.py

@@ -5,10 +5,7 @@ import os
 import six
 import sys
 from six.moves import map
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 
 PROGNAME = os.path.basename(sys.argv[0]) or 'koji'

tests/test_docs_version.py

@@ -2,10 +2,7 @@ from __future__ import absolute_import
 import os
 import six
 import subprocess
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 # docs version lives in docs/source/conf.py
 TOPDIR = os.path.dirname(__file__) + '/..'

tests/test_hub/test_models/test_host.py

@@ -1,9 +1,6 @@
 from __future__ import absolute_import
 import mock
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 import koji
 import kojihub

tests/test_kojira/test_repo_manager.py

@@ -1,10 +1,7 @@
 from __future__ import absolute_import
 import mock
 import time
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 import koji
 

tests/test_lib/test_argspec.py

@@ -1,8 +1,5 @@
 from __future__ import absolute_import
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 import koji.util
 

tests/test_lib/test_auth.py

@@ -2,10 +2,7 @@ from __future__ import absolute_import
 
 import mock
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 import six
 
 import koji

tests/test_lib/test_base64.py

@@ -1,10 +1,7 @@
 # coding=utf-8
 from __future__ import absolute_import
 import six
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji.util import base64encode
 

tests/test_lib/test_check_sigmd5.py

@@ -3,10 +3,7 @@ from __future__ import absolute_import
 import os.path
 import shutil
 import tempfile
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji.util import check_sigmd5
 

tests/test_lib/test_client_session.py

@@ -2,10 +2,7 @@ from __future__ import absolute_import
 import mock
 import six
 import weakref
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 import koji
 from koji.xmlrpcplus import Fault

tests/test_lib/test_context.py

@@ -3,10 +3,7 @@ import six
 import time
 import random
 from six.moves import range
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji.context import context
 

tests/test_lib/test_decode_bytes.py

@@ -1,10 +1,7 @@
 # coding=utf-8
 from __future__ import absolute_import
 import six
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from koji.util import decode_bytes
 

tests/test_lib/test_encode_datetime.py

@@ -1,9 +1,6 @@
 from __future__ import absolute_import
 import datetime
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 import koji.util
 from koji.xmlrpcplus import DateTime

tests/test_lib/test_file_ops.py

@@ -1,9 +1,6 @@
 from __future__ import absolute_import
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 import mock
 import errno

tests/test_lib/test_fixEncoding.py

@@ -7,10 +7,7 @@ from __future__ import absolute_import
 import koji
 import mock
 import six
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 
 class FixEncodingTestCase(unittest.TestCase):

tests/test_lib/test_format_time.py

@@ -3,10 +3,7 @@ import datetime
 import os
 import time
 import locale
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 import six.moves.xmlrpc_client as xmlrpc_client
 

tests/test_lib/test_gen_mock_config.py

@@ -2,10 +2,7 @@ from __future__ import absolute_import
 import ast
 import os
 import os.path
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 import koji
 

tests/test_lib/test_grab_session_options.py

@@ -1,9 +1,6 @@
 from __future__ import absolute_import
 import optparse
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 import koji
 

tests/test_lib/test_gssapi.py

@@ -2,10 +2,7 @@ from __future__ import absolute_import
 
 import mock
 import os
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 import koji
 

tests/test_lib/test_multicall_session.py

@@ -1,8 +1,5 @@
 import mock
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 import koji