From b030b46f74985d66e54cb8397247949bcced294e Mon Sep 17 00:00:00 2001 From: Tomas Kopecek Date: Mon, 14 Sep 2020 12:56:45 +0200 Subject: [PATCH] remove unittest2 --- tests/test_builder/test_build_notification.py | 7 +------ tests/test_builder/test_choose_taskarch.py | 5 +---- tests/test_builder/test_delay_times.py | 5 +---- tests/test_builder/test_taskparams.py | 5 +---- tests/test_builder/test_volume_id.py | 5 +---- tests/test_cli/test_activate_session.py | 5 +---- tests/test_cli/test_add_group.py | 5 +---- tests/test_cli/test_add_group_pkg.py | 5 +---- tests/test_cli/test_add_group_req.py | 5 +---- tests/test_cli/test_add_host_to_channel.py | 5 +---- tests/test_cli/test_add_notification.py | 5 +---- tests/test_cli/test_add_pkg.py | 5 +---- tests/test_cli/test_add_tag.py | 5 +---- tests/test_cli/test_add_user.py | 5 +---- tests/test_cli/test_add_volume.py | 5 +---- tests/test_cli/test_assign_task.py | 7 +------ tests/test_cli/test_block_group_pkg.py | 5 +---- tests/test_cli/test_block_group_req.py | 5 +---- tests/test_cli/test_call.py | 5 +---- tests/test_cli/test_chain_build.py | 5 +---- tests/test_cli/test_clone_tag.py | 5 +---- tests/test_cli/test_disable_host.py | 5 +---- tests/test_cli/test_disable_user.py | 5 +---- tests/test_cli/test_dist_repo.py | 5 +---- tests/test_cli/test_download_file.py | 5 +---- tests/test_cli/test_edit_external_repo.py | 5 +---- tests/test_cli/test_edit_host.py | 5 +---- tests/test_cli/test_edit_notification.py | 5 +---- tests/test_cli/test_edit_user.py | 5 +---- tests/test_cli/test_enable_host.py | 5 +---- tests/test_cli/test_enable_user.py | 5 +---- tests/test_cli/test_grant_cg_access.py | 5 +---- tests/test_cli/test_grant_permission.py | 5 +---- tests/test_cli/test_hello.py | 5 +---- tests/test_cli/test_image_build.py | 5 +---- tests/test_cli/test_image_build_indirection.py | 5 +---- tests/test_cli/test_import.py | 5 +---- tests/test_cli/test_import_cg.py | 5 +---- tests/test_cli/test_import_comps.py | 5 +---- tests/test_cli/test_import_sig.py | 5 +---- tests/test_cli/test_list_api.py | 5 +---- tests/test_cli/test_list_channels.py | 5 +---- tests/test_cli/test_list_commands.py | 5 +---- tests/test_cli/test_list_groups.py | 5 +---- tests/test_cli/test_list_notifications.py | 5 +---- tests/test_cli/test_list_permissions.py | 5 +---- tests/test_cli/test_list_tasks.py | 5 +---- tests/test_cli/test_list_volumes.py | 5 +---- tests/test_cli/test_load_plugins.py | 5 +---- tests/test_cli/test_maven_build.py | 5 +---- tests/test_cli/test_maven_chain.py | 5 +---- tests/test_cli/test_mock_config.py | 5 +---- tests/test_cli/test_move_build.py | 5 +---- tests/test_cli/test_regen_repo.py | 5 +---- tests/test_cli/test_remove_channel.py | 5 +---- tests/test_cli/test_remove_host_from_channel.py | 5 +---- tests/test_cli/test_remove_notification.py | 5 +---- tests/test_cli/test_remove_pkg.py | 5 +---- tests/test_cli/test_rename_channel.py | 5 +---- tests/test_cli/test_restart_host.py | 5 +---- tests/test_cli/test_resubmit.py | 5 +---- tests/test_cli/test_revoke_cg_access.py | 5 +---- tests/test_cli/test_revoke_permission.py | 5 +---- tests/test_cli/test_running_in_bg.py | 5 +---- tests/test_cli/test_search.py | 5 +---- tests/test_cli/test_set_build_volume.py | 5 +---- tests/test_cli/test_set_pkg_arches.py | 5 +---- tests/test_cli/test_set_pkg_owner.py | 5 +---- tests/test_cli/test_set_task_priority.py | 5 +---- tests/test_cli/test_spin_commands.py | 5 +---- tests/test_cli/test_tag_build.py | 5 +---- tests/test_cli/test_taskinfo.py | 5 +---- tests/test_cli/test_unblock_group_pkg.py | 5 +---- tests/test_cli/test_unblock_group_req.py | 5 +---- tests/test_cli/test_unblock_pkg.py | 5 +---- tests/test_cli/test_unique_path.py | 5 +---- tests/test_cli/test_upload_progress_callback.py | 5 +---- tests/test_cli/test_wait_repo.py | 5 +---- tests/test_cli/test_watch_tasks.py | 5 +---- tests/test_cli/test_wrapper_rpm.py | 5 +---- tests/test_cli/test_write_signed_rpm.py | 5 +---- tests/test_cli/utils.py | 5 +---- tests/test_docs_version.py | 5 +---- tests/test_hub/test_models/test_host.py | 5 +---- tests/test_kojira/test_repo_manager.py | 5 +---- tests/test_lib/test_argspec.py | 5 +---- tests/test_lib/test_auth.py | 5 +---- tests/test_lib/test_base64.py | 5 +---- tests/test_lib/test_check_sigmd5.py | 5 +---- tests/test_lib/test_client_session.py | 5 +---- tests/test_lib/test_context.py | 5 +---- tests/test_lib/test_decode_bytes.py | 5 +---- tests/test_lib/test_encode_datetime.py | 5 +---- tests/test_lib/test_file_ops.py | 5 +---- tests/test_lib/test_fixEncoding.py | 5 +---- tests/test_lib/test_format_time.py | 5 +---- tests/test_lib/test_gen_mock_config.py | 5 +---- tests/test_lib/test_grab_session_options.py | 5 +---- tests/test_lib/test_gssapi.py | 5 +---- tests/test_lib/test_multicall_session.py | 5 +---- tests/test_lib/test_parse_arches.py | 5 +---- tests/test_lib/test_parsers.py | 5 +---- tests/test_lib/test_plugin.py | 5 +---- tests/test_lib/test_policy.py | 5 +---- tests/test_lib/test_profiles.py | 5 +---- tests/test_lib/test_restart_tasks.py | 5 +---- tests/test_lib/test_tasks.py | 5 +---- tests/test_lib/test_utils.py | 5 +---- tests/test_lib/test_xmlrpcplus.py | 5 +---- tests/test_plugins/test_protonmsg.py | 5 +---- tests/test_plugins/test_runroot_builder.py | 5 +---- tests/test_plugins/test_runroot_cli.py | 5 +---- tests/test_plugins/test_runroot_hub.py | 5 +---- tests/test_plugins/test_save_failed_tree_builder.py | 5 +---- tests/test_plugins/test_save_failed_tree_cli.py | 5 +---- tests/test_scm.py | 5 +---- 116 files changed, 116 insertions(+), 468 deletions(-) diff --git a/tests/test_builder/test_build_notification.py b/tests/test_builder/test_build_notification.py index da92ba5a..69aa06d9 100644 --- a/tests/test_builder/test_build_notification.py +++ b/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): diff --git a/tests/test_builder/test_choose_taskarch.py b/tests/test_builder/test_choose_taskarch.py index e5cd0dd7..a1c2c3f6 100644 --- a/tests/test_builder/test_choose_taskarch.py +++ b/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 diff --git a/tests/test_builder/test_delay_times.py b/tests/test_builder/test_delay_times.py index 068d267b..aa7bb2a8 100644 --- a/tests/test_builder/test_delay_times.py +++ b/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 diff --git a/tests/test_builder/test_taskparams.py b/tests/test_builder/test_taskparams.py index 69e91524..9e590f91 100644 --- a/tests/test_builder/test_taskparams.py +++ b/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 diff --git a/tests/test_builder/test_volume_id.py b/tests/test_builder/test_volume_id.py index c37f6224..2e557e6f 100644 --- a/tests/test_builder/test_volume_id.py +++ b/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 diff --git a/tests/test_cli/test_activate_session.py b/tests/test_cli/test_activate_session.py index 70c099e6..23e700bf 100644 --- a/tests/test_cli/test_activate_session.py +++ b/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 diff --git a/tests/test_cli/test_add_group.py b/tests/test_cli/test_add_group.py index dc1582c8..04e5b422 100644 --- a/tests/test_cli/test_add_group.py +++ b/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 diff --git a/tests/test_cli/test_add_group_pkg.py b/tests/test_cli/test_add_group_pkg.py index 1531c19b..dd2fa266 100644 --- a/tests/test_cli/test_add_group_pkg.py +++ b/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 diff --git a/tests/test_cli/test_add_group_req.py b/tests/test_cli/test_add_group_req.py index d8dd90d4..9502bb7e 100644 --- a/tests/test_cli/test_add_group_req.py +++ b/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 diff --git a/tests/test_cli/test_add_host_to_channel.py b/tests/test_cli/test_add_host_to_channel.py index 1c3c2454..22a24b58 100644 --- a/tests/test_cli/test_add_host_to_channel.py +++ b/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 diff --git a/tests/test_cli/test_add_notification.py b/tests/test_cli/test_add_notification.py index 7e121d46..51da4a2c 100644 --- a/tests/test_cli/test_add_notification.py +++ b/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 diff --git a/tests/test_cli/test_add_pkg.py b/tests/test_cli/test_add_pkg.py index e8d5b284..d50d8780 100644 --- a/tests/test_cli/test_add_pkg.py +++ b/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 diff --git a/tests/test_cli/test_add_tag.py b/tests/test_cli/test_add_tag.py index c24c3e37..1123eabd 100644 --- a/tests/test_cli/test_add_tag.py +++ b/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 diff --git a/tests/test_cli/test_add_user.py b/tests/test_cli/test_add_user.py index 388f60e1..d0604dac 100644 --- a/tests/test_cli/test_add_user.py +++ b/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 diff --git a/tests/test_cli/test_add_volume.py b/tests/test_cli/test_add_volume.py index 0710321e..dceff3bd 100644 --- a/tests/test_cli/test_add_volume.py +++ b/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 diff --git a/tests/test_cli/test_assign_task.py b/tests/test_cli/test_assign_task.py index c68ef79e..c7ab2d3c 100644 --- a/tests/test_cli/test_assign_task.py +++ b/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 diff --git a/tests/test_cli/test_block_group_pkg.py b/tests/test_cli/test_block_group_pkg.py index da56e13a..52d6d60e 100644 --- a/tests/test_cli/test_block_group_pkg.py +++ b/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 diff --git a/tests/test_cli/test_block_group_req.py b/tests/test_cli/test_block_group_req.py index 39d4253d..47a79fb1 100644 --- a/tests/test_cli/test_block_group_req.py +++ b/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 diff --git a/tests/test_cli/test_call.py b/tests/test_cli/test_call.py index dfba8b8f..a459dcca 100644 --- a/tests/test_cli/test_call.py +++ b/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 diff --git a/tests/test_cli/test_chain_build.py b/tests/test_cli/test_chain_build.py index c23f58cb..0b9ac038 100644 --- a/tests/test_cli/test_chain_build.py +++ b/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 diff --git a/tests/test_cli/test_clone_tag.py b/tests/test_cli/test_clone_tag.py index 2ab39a60..67d4e0de 100644 --- a/tests/test_cli/test_clone_tag.py +++ b/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 diff --git a/tests/test_cli/test_disable_host.py b/tests/test_cli/test_disable_host.py index e8824e6b..46d322dd 100644 --- a/tests/test_cli/test_disable_host.py +++ b/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 diff --git a/tests/test_cli/test_disable_user.py b/tests/test_cli/test_disable_user.py index ef1f83c9..2e02ee64 100644 --- a/tests/test_cli/test_disable_user.py +++ b/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 diff --git a/tests/test_cli/test_dist_repo.py b/tests/test_cli/test_dist_repo.py index 45b9a2e9..b400b629 100644 --- a/tests/test_cli/test_dist_repo.py +++ b/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 diff --git a/tests/test_cli/test_download_file.py b/tests/test_cli/test_download_file.py index c0bb333b..894398f6 100644 --- a/tests/test_cli/test_download_file.py +++ b/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 diff --git a/tests/test_cli/test_edit_external_repo.py b/tests/test_cli/test_edit_external_repo.py index dda7bddf..6adf1c83 100644 --- a/tests/test_cli/test_edit_external_repo.py +++ b/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 diff --git a/tests/test_cli/test_edit_host.py b/tests/test_cli/test_edit_host.py index 578db7a0..306d935b 100644 --- a/tests/test_cli/test_edit_host.py +++ b/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 diff --git a/tests/test_cli/test_edit_notification.py b/tests/test_cli/test_edit_notification.py index b265df18..8204709d 100644 --- a/tests/test_cli/test_edit_notification.py +++ b/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 diff --git a/tests/test_cli/test_edit_user.py b/tests/test_cli/test_edit_user.py index 5c799200..56a776b9 100644 --- a/tests/test_cli/test_edit_user.py +++ b/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 diff --git a/tests/test_cli/test_enable_host.py b/tests/test_cli/test_enable_host.py index fc5941f1..d5d62710 100644 --- a/tests/test_cli/test_enable_host.py +++ b/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 diff --git a/tests/test_cli/test_enable_user.py b/tests/test_cli/test_enable_user.py index 8145c97f..faf75990 100644 --- a/tests/test_cli/test_enable_user.py +++ b/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 diff --git a/tests/test_cli/test_grant_cg_access.py b/tests/test_cli/test_grant_cg_access.py index f445eea9..2b63d897 100644 --- a/tests/test_cli/test_grant_cg_access.py +++ b/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 diff --git a/tests/test_cli/test_grant_permission.py b/tests/test_cli/test_grant_permission.py index 2cc82907..b8419fa5 100644 --- a/tests/test_cli/test_grant_permission.py +++ b/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 diff --git a/tests/test_cli/test_hello.py b/tests/test_cli/test_hello.py index e345c2a4..dcf840ac 100644 --- a/tests/test_cli/test_hello.py +++ b/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 diff --git a/tests/test_cli/test_image_build.py b/tests/test_cli/test_image_build.py index 42782292..00040bc7 100644 --- a/tests/test_cli/test_image_build.py +++ b/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 diff --git a/tests/test_cli/test_image_build_indirection.py b/tests/test_cli/test_image_build_indirection.py index dfc0d670..9b6aa4a5 100644 --- a/tests/test_cli/test_image_build_indirection.py +++ b/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 diff --git a/tests/test_cli/test_import.py b/tests/test_cli/test_import.py index 623567f3..654b9b77 100644 --- a/tests/test_cli/test_import.py +++ b/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 diff --git a/tests/test_cli/test_import_cg.py b/tests/test_cli/test_import_cg.py index 1875a51c..11ca191d 100644 --- a/tests/test_cli/test_import_cg.py +++ b/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): diff --git a/tests/test_cli/test_import_comps.py b/tests/test_cli/test_import_comps.py index 18abae48..ae0cbee7 100644 --- a/tests/test_cli/test_import_comps.py +++ b/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 diff --git a/tests/test_cli/test_import_sig.py b/tests/test_cli/test_import_sig.py index 828ef9b2..074a2275 100644 --- a/tests/test_cli/test_import_sig.py +++ b/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 diff --git a/tests/test_cli/test_list_api.py b/tests/test_cli/test_list_api.py index 556afcfe..deed4fca 100644 --- a/tests/test_cli/test_list_api.py +++ b/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 diff --git a/tests/test_cli/test_list_channels.py b/tests/test_cli/test_list_channels.py index 84a60224..a2a256ac 100644 --- a/tests/test_cli/test_list_channels.py +++ b/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 diff --git a/tests/test_cli/test_list_commands.py b/tests/test_cli/test_list_commands.py index ef9b1f2b..e2659496 100644 --- a/tests/test_cli/test_list_commands.py +++ b/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 diff --git a/tests/test_cli/test_list_groups.py b/tests/test_cli/test_list_groups.py index 0abe89f5..a6e0f646 100644 --- a/tests/test_cli/test_list_groups.py +++ b/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 diff --git a/tests/test_cli/test_list_notifications.py b/tests/test_cli/test_list_notifications.py index a214abd2..c2264d58 100644 --- a/tests/test_cli/test_list_notifications.py +++ b/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 diff --git a/tests/test_cli/test_list_permissions.py b/tests/test_cli/test_list_permissions.py index 1afb215f..29f33d27 100644 --- a/tests/test_cli/test_list_permissions.py +++ b/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 diff --git a/tests/test_cli/test_list_tasks.py b/tests/test_cli/test_list_tasks.py index 8daebc1a..ac45f298 100644 --- a/tests/test_cli/test_list_tasks.py +++ b/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 diff --git a/tests/test_cli/test_list_volumes.py b/tests/test_cli/test_list_volumes.py index 0df51027..4c60bb5d 100644 --- a/tests/test_cli/test_list_volumes.py +++ b/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 diff --git a/tests/test_cli/test_load_plugins.py b/tests/test_cli/test_load_plugins.py index 7e7e7b11..c9aa6a35 100644 --- a/tests/test_cli/test_load_plugins.py +++ b/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 diff --git a/tests/test_cli/test_maven_build.py b/tests/test_cli/test_maven_build.py index 0ab2f345..01d421f7 100644 --- a/tests/test_cli/test_maven_build.py +++ b/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 diff --git a/tests/test_cli/test_maven_chain.py b/tests/test_cli/test_maven_chain.py index 23f11440..5510d072 100644 --- a/tests/test_cli/test_maven_chain.py +++ b/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 diff --git a/tests/test_cli/test_mock_config.py b/tests/test_cli/test_mock_config.py index a863f15d..440605f9 100644 --- a/tests/test_cli/test_mock_config.py +++ b/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 diff --git a/tests/test_cli/test_move_build.py b/tests/test_cli/test_move_build.py index 3398fcd0..44d93125 100644 --- a/tests/test_cli/test_move_build.py +++ b/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 diff --git a/tests/test_cli/test_regen_repo.py b/tests/test_cli/test_regen_repo.py index 90f16b12..c19c411b 100644 --- a/tests/test_cli/test_regen_repo.py +++ b/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 diff --git a/tests/test_cli/test_remove_channel.py b/tests/test_cli/test_remove_channel.py index a82ca697..17cbc270 100644 --- a/tests/test_cli/test_remove_channel.py +++ b/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 diff --git a/tests/test_cli/test_remove_host_from_channel.py b/tests/test_cli/test_remove_host_from_channel.py index a0dd8a17..05ba32bd 100644 --- a/tests/test_cli/test_remove_host_from_channel.py +++ b/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 diff --git a/tests/test_cli/test_remove_notification.py b/tests/test_cli/test_remove_notification.py index df253a56..8354e1e5 100644 --- a/tests/test_cli/test_remove_notification.py +++ b/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 diff --git a/tests/test_cli/test_remove_pkg.py b/tests/test_cli/test_remove_pkg.py index 8c5df10e..178e268c 100644 --- a/tests/test_cli/test_remove_pkg.py +++ b/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 diff --git a/tests/test_cli/test_rename_channel.py b/tests/test_cli/test_rename_channel.py index 45857e65..d1cb5ab3 100644 --- a/tests/test_cli/test_rename_channel.py +++ b/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 diff --git a/tests/test_cli/test_restart_host.py b/tests/test_cli/test_restart_host.py index 49bf40ed..750bb3d9 100644 --- a/tests/test_cli/test_restart_host.py +++ b/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 diff --git a/tests/test_cli/test_resubmit.py b/tests/test_cli/test_resubmit.py index 664eaa70..4a9d9d0a 100644 --- a/tests/test_cli/test_resubmit.py +++ b/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 diff --git a/tests/test_cli/test_revoke_cg_access.py b/tests/test_cli/test_revoke_cg_access.py index 9aa381a5..8b3107c4 100644 --- a/tests/test_cli/test_revoke_cg_access.py +++ b/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 diff --git a/tests/test_cli/test_revoke_permission.py b/tests/test_cli/test_revoke_permission.py index f8071452..e532df0b 100644 --- a/tests/test_cli/test_revoke_permission.py +++ b/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 diff --git a/tests/test_cli/test_running_in_bg.py b/tests/test_cli/test_running_in_bg.py index 0f5169d3..9829782f 100644 --- a/tests/test_cli/test_running_in_bg.py +++ b/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 diff --git a/tests/test_cli/test_search.py b/tests/test_cli/test_search.py index 1d4c6c3d..a6920923 100644 --- a/tests/test_cli/test_search.py +++ b/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 diff --git a/tests/test_cli/test_set_build_volume.py b/tests/test_cli/test_set_build_volume.py index 357527e5..33302f16 100644 --- a/tests/test_cli/test_set_build_volume.py +++ b/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 diff --git a/tests/test_cli/test_set_pkg_arches.py b/tests/test_cli/test_set_pkg_arches.py index 6501e79c..fd4ecafb 100644 --- a/tests/test_cli/test_set_pkg_arches.py +++ b/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 diff --git a/tests/test_cli/test_set_pkg_owner.py b/tests/test_cli/test_set_pkg_owner.py index 18e57af9..03bef5e0 100644 --- a/tests/test_cli/test_set_pkg_owner.py +++ b/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 diff --git a/tests/test_cli/test_set_task_priority.py b/tests/test_cli/test_set_task_priority.py index 1455fc0e..15de222b 100644 --- a/tests/test_cli/test_set_task_priority.py +++ b/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 diff --git a/tests/test_cli/test_spin_commands.py b/tests/test_cli/test_spin_commands.py index f5f3c42c..9a4ea1a8 100644 --- a/tests/test_cli/test_spin_commands.py +++ b/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 diff --git a/tests/test_cli/test_tag_build.py b/tests/test_cli/test_tag_build.py index 786e4be6..c9916632 100644 --- a/tests/test_cli/test_tag_build.py +++ b/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 diff --git a/tests/test_cli/test_taskinfo.py b/tests/test_cli/test_taskinfo.py index 08bb3ca5..3886c7d9 100644 --- a/tests/test_cli/test_taskinfo.py +++ b/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, \ diff --git a/tests/test_cli/test_unblock_group_pkg.py b/tests/test_cli/test_unblock_group_pkg.py index d82deb17..7ae184e9 100644 --- a/tests/test_cli/test_unblock_group_pkg.py +++ b/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 diff --git a/tests/test_cli/test_unblock_group_req.py b/tests/test_cli/test_unblock_group_req.py index cd88a9c0..5b20a2df 100644 --- a/tests/test_cli/test_unblock_group_req.py +++ b/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 diff --git a/tests/test_cli/test_unblock_pkg.py b/tests/test_cli/test_unblock_pkg.py index 1d1923bc..1fb25d14 100644 --- a/tests/test_cli/test_unblock_pkg.py +++ b/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 diff --git a/tests/test_cli/test_unique_path.py b/tests/test_cli/test_unique_path.py index a223b9a1..d07613b8 100644 --- a/tests/test_cli/test_unique_path.py +++ b/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 diff --git a/tests/test_cli/test_upload_progress_callback.py b/tests/test_cli/test_upload_progress_callback.py index 6bcf62f9..c291998c 100644 --- a/tests/test_cli/test_upload_progress_callback.py +++ b/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 diff --git a/tests/test_cli/test_wait_repo.py b/tests/test_cli/test_wait_repo.py index a73776fe..d0388f89 100644 --- a/tests/test_cli/test_wait_repo.py +++ b/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 diff --git a/tests/test_cli/test_watch_tasks.py b/tests/test_cli/test_watch_tasks.py index 8a35fba9..afec4e5d 100644 --- a/tests/test_cli/test_watch_tasks.py +++ b/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 diff --git a/tests/test_cli/test_wrapper_rpm.py b/tests/test_cli/test_wrapper_rpm.py index beb83826..2129d135 100644 --- a/tests/test_cli/test_wrapper_rpm.py +++ b/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 diff --git a/tests/test_cli/test_write_signed_rpm.py b/tests/test_cli/test_write_signed_rpm.py index 1c6a07f8..38643a89 100644 --- a/tests/test_cli/test_write_signed_rpm.py +++ b/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 diff --git a/tests/test_cli/utils.py b/tests/test_cli/utils.py index 31bb4f63..31bef581 100644 --- a/tests/test_cli/utils.py +++ b/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' diff --git a/tests/test_docs_version.py b/tests/test_docs_version.py index b4f33b16..f99627be 100644 --- a/tests/test_docs_version.py +++ b/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__) + '/..' diff --git a/tests/test_hub/test_models/test_host.py b/tests/test_hub/test_models/test_host.py index 1a39a2e9..950d4821 100644 --- a/tests/test_hub/test_models/test_host.py +++ b/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 diff --git a/tests/test_kojira/test_repo_manager.py b/tests/test_kojira/test_repo_manager.py index 928a244a..475bcff6 100644 --- a/tests/test_kojira/test_repo_manager.py +++ b/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 diff --git a/tests/test_lib/test_argspec.py b/tests/test_lib/test_argspec.py index a565a64b..60b3e248 100644 --- a/tests/test_lib/test_argspec.py +++ b/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 diff --git a/tests/test_lib/test_auth.py b/tests/test_lib/test_auth.py index e92a12b2..dbb5e39a 100644 --- a/tests/test_lib/test_auth.py +++ b/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 diff --git a/tests/test_lib/test_base64.py b/tests/test_lib/test_base64.py index 65d42db9..1520f819 100644 --- a/tests/test_lib/test_base64.py +++ b/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 diff --git a/tests/test_lib/test_check_sigmd5.py b/tests/test_lib/test_check_sigmd5.py index ae5a7d81..e126c23c 100644 --- a/tests/test_lib/test_check_sigmd5.py +++ b/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 diff --git a/tests/test_lib/test_client_session.py b/tests/test_lib/test_client_session.py index 269d64a5..ebe3dff1 100644 --- a/tests/test_lib/test_client_session.py +++ b/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 diff --git a/tests/test_lib/test_context.py b/tests/test_lib/test_context.py index 660e6cdf..695a3a59 100644 --- a/tests/test_lib/test_context.py +++ b/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 diff --git a/tests/test_lib/test_decode_bytes.py b/tests/test_lib/test_decode_bytes.py index dddaff05..7256c5bc 100644 --- a/tests/test_lib/test_decode_bytes.py +++ b/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 diff --git a/tests/test_lib/test_encode_datetime.py b/tests/test_lib/test_encode_datetime.py index e2a2909f..505c236a 100644 --- a/tests/test_lib/test_encode_datetime.py +++ b/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 diff --git a/tests/test_lib/test_file_ops.py b/tests/test_lib/test_file_ops.py index dfb6069b..1aa2a126 100644 --- a/tests/test_lib/test_file_ops.py +++ b/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 diff --git a/tests/test_lib/test_fixEncoding.py b/tests/test_lib/test_fixEncoding.py index ab26399f..eaf8b97a 100644 --- a/tests/test_lib/test_fixEncoding.py +++ b/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): diff --git a/tests/test_lib/test_format_time.py b/tests/test_lib/test_format_time.py index 7fb588e8..6946c3ea 100644 --- a/tests/test_lib/test_format_time.py +++ b/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 diff --git a/tests/test_lib/test_gen_mock_config.py b/tests/test_lib/test_gen_mock_config.py index b6d822a0..320ba44a 100644 --- a/tests/test_lib/test_gen_mock_config.py +++ b/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 diff --git a/tests/test_lib/test_grab_session_options.py b/tests/test_lib/test_grab_session_options.py index d46cefd2..7b441516 100644 --- a/tests/test_lib/test_grab_session_options.py +++ b/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 diff --git a/tests/test_lib/test_gssapi.py b/tests/test_lib/test_gssapi.py index c87e8cc6..f796f8f7 100644 --- a/tests/test_lib/test_gssapi.py +++ b/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 diff --git a/tests/test_lib/test_multicall_session.py b/tests/test_lib/test_multicall_session.py index 15b9142d..c4978e47 100644 --- a/tests/test_lib/test_multicall_session.py +++ b/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 diff --git a/tests/test_lib/test_parse_arches.py b/tests/test_lib/test_parse_arches.py index a5aaeac8..00d0d77a 100644 --- a/tests/test_lib/test_parse_arches.py +++ b/tests/test_lib/test_parse_arches.py @@ -1,9 +1,6 @@ # coding: utf-8 from __future__ import absolute_import -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import koji class TestParseArchesString(unittest.TestCase): diff --git a/tests/test_lib/test_parsers.py b/tests/test_lib/test_parsers.py index 8c67f671..e49217a3 100644 --- a/tests/test_lib/test_parsers.py +++ b/tests/test_lib/test_parsers.py @@ -6,10 +6,7 @@ from __future__ import absolute_import import mock import os import rpm -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import koji diff --git a/tests/test_lib/test_plugin.py b/tests/test_lib/test_plugin.py index 099877fe..710a5c08 100644 --- a/tests/test_lib/test_plugin.py +++ b/tests/test_lib/test_plugin.py @@ -3,10 +3,7 @@ import copy import datetime import mock from six.moves import range -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import koji import koji.util diff --git a/tests/test_lib/test_policy.py b/tests/test_lib/test_policy.py index 26cb1050..fe907fd3 100644 --- a/tests/test_lib/test_policy.py +++ b/tests/test_lib/test_policy.py @@ -1,8 +1,5 @@ from __future__ import absolute_import -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest from nose.tools import raises diff --git a/tests/test_lib/test_profiles.py b/tests/test_lib/test_profiles.py index 00825706..1ec72e71 100644 --- a/tests/test_lib/test_profiles.py +++ b/tests/test_lib/test_profiles.py @@ -6,10 +6,7 @@ import traceback import mock from six.moves import range -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest class ProfilesTestCase(unittest.TestCase): diff --git a/tests/test_lib/test_restart_tasks.py b/tests/test_lib/test_restart_tasks.py index 860865c6..d307585b 100644 --- a/tests/test_lib/test_restart_tasks.py +++ b/tests/test_lib/test_restart_tasks.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 import koji.tasks diff --git a/tests/test_lib/test_tasks.py b/tests/test_lib/test_tasks.py index ef2c04fd..8dcd123b 100644 --- a/tests/test_lib/test_tasks.py +++ b/tests/test_lib/test_tasks.py @@ -3,10 +3,7 @@ import random import shutil import six from six.moves import range -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest from os import path, makedirs from tempfile import gettempdir diff --git a/tests/test_lib/test_utils.py b/tests/test_lib/test_utils.py index e9080a15..60d9c7ef 100644 --- a/tests/test_lib/test_utils.py +++ b/tests/test_lib/test_utils.py @@ -10,10 +10,7 @@ import resource import six.moves.configparser import time import six -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import requests_mock from mock import call, patch diff --git a/tests/test_lib/test_xmlrpcplus.py b/tests/test_lib/test_xmlrpcplus.py index 7ea54243..43974ef9 100644 --- a/tests/test_lib/test_xmlrpcplus.py +++ b/tests/test_lib/test_xmlrpcplus.py @@ -1,10 +1,7 @@ # coding=utf-8 from __future__ import absolute_import from six.moves import range -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest from six.moves import xmlrpc_client from koji import xmlrpcplus diff --git a/tests/test_plugins/test_protonmsg.py b/tests/test_plugins/test_protonmsg.py index 9a38bbda..82642cdf 100644 --- a/tests/test_plugins/test_protonmsg.py +++ b/tests/test_plugins/test_protonmsg.py @@ -2,10 +2,7 @@ from __future__ import absolute_import import six import protonmsg import tempfile -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest from mock import patch, MagicMock from koji.context import context diff --git a/tests/test_plugins/test_runroot_builder.py b/tests/test_plugins/test_runroot_builder.py index 014cb00c..24998cbe 100644 --- a/tests/test_plugins/test_runroot_builder.py +++ b/tests/test_plugins/test_runroot_builder.py @@ -1,10 +1,7 @@ from __future__ import absolute_import import copy import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import six.moves.configparser diff --git a/tests/test_plugins/test_runroot_cli.py b/tests/test_plugins/test_runroot_cli.py index b002cc70..17bb6df7 100644 --- a/tests/test_plugins/test_runroot_cli.py +++ b/tests/test_plugins/test_runroot_cli.py @@ -2,10 +2,7 @@ from __future__ import absolute_import import io import mock import six -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import koji from . import load_plugin diff --git a/tests/test_plugins/test_runroot_hub.py b/tests/test_plugins/test_runroot_hub.py index dfae6057..f78b2e0f 100644 --- a/tests/test_plugins/test_runroot_hub.py +++ b/tests/test_plugins/test_runroot_hub.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 runroot_hub diff --git a/tests/test_plugins/test_save_failed_tree_builder.py b/tests/test_plugins/test_save_failed_tree_builder.py index 909e8a3f..920f6059 100644 --- a/tests/test_plugins/test_save_failed_tree_builder.py +++ b/tests/test_plugins/test_save_failed_tree_builder.py @@ -2,10 +2,7 @@ from __future__ import absolute_import import mock import os import sys -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest # alter pythonpath to not load hub plugin sys.path = [os.path.join(os.path.dirname(__file__), '../../plugins/builder')] + sys.path diff --git a/tests/test_plugins/test_save_failed_tree_cli.py b/tests/test_plugins/test_save_failed_tree_cli.py index 676d85cc..9bb65bbc 100644 --- a/tests/test_plugins/test_save_failed_tree_cli.py +++ b/tests/test_plugins/test_save_failed_tree_cli.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 diff --git a/tests/test_scm.py b/tests/test_scm.py index 5f1c668a..54b26910 100644 --- a/tests/test_scm.py +++ b/tests/test_scm.py @@ -4,10 +4,7 @@ import mock import shutil import six import tempfile -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import koji import koji.daemon