diff --git a/test-requirements.txt b/test-requirements.txt index db667730..338b8ff3 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,4 +2,3 @@ mock; python_version < '3.3' parameterized pytest pytest-cov -unittest2; python_version < '3.0' diff --git a/tests/helpers.py b/tests/helpers.py index 5fc788bd..16831b57 100644 --- a/tests/helpers.py +++ b/tests/helpers.py @@ -15,10 +15,7 @@ except ImportError: import six from kobo.rpmlib import parse_nvr -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest from pungi.util import get_arch_variant_data from pungi import paths, checks diff --git a/tests/test_arguments.py b/tests/test_arguments.py index b67fdc4b..3903ce26 100644 --- a/tests/test_arguments.py +++ b/tests/test_arguments.py @@ -3,10 +3,7 @@ try: except ImportError: import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import six from pungi.scripts.pungi_koji import cli_main diff --git a/tests/test_buildinstall.py b/tests/test_buildinstall.py index bea99747..16ea99bc 100644 --- a/tests/test_buildinstall.py +++ b/tests/test_buildinstall.py @@ -1,10 +1,6 @@ # -*- coding: utf-8 -*- - -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest try: from unittest import mock diff --git a/tests/test_checks.py b/tests/test_checks.py index 864da165..963b159d 100644 --- a/tests/test_checks.py +++ b/tests/test_checks.py @@ -5,10 +5,7 @@ try: except ImportError: import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import os from six import StringIO diff --git a/tests/test_compose.py b/tests/test_compose.py index f0317c15..9a476b32 100644 --- a/tests/test_compose.py +++ b/tests/test_compose.py @@ -7,15 +7,12 @@ try: except ImportError: import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import json import os +import shutil import six import tempfile -import shutil -import json +import unittest from requests.exceptions import HTTPError diff --git a/tests/test_comps_wrapper.py b/tests/test_comps_wrapper.py index cee03dcb..c2ae20c7 100644 --- a/tests/test_comps_wrapper.py +++ b/tests/test_comps_wrapper.py @@ -1,10 +1,7 @@ # -*- coding: utf-8 -*- -try: - import unittest2 as unittest -except ImportError: - import unittest import tempfile +import unittest import os diff --git a/tests/test_config.py b/tests/test_config.py index dc02661d..81712f0e 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -1,10 +1,6 @@ # -*- coding: utf-8 -*- - -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import six diff --git a/tests/test_config_utils.py b/tests/test_config_utils.py index 571de650..bc019f8c 100644 --- a/tests/test_config_utils.py +++ b/tests/test_config_utils.py @@ -1,10 +1,7 @@ # -*- coding: utf-8 -*- -try: - import unittest2 as unittest -except ImportError: - import unittest import argparse +import unittest from parameterized import parameterized diff --git a/tests/test_createrepo_wrapper.py b/tests/test_createrepo_wrapper.py index 9d968bb2..a5513ffb 100644 --- a/tests/test_createrepo_wrapper.py +++ b/tests/test_createrepo_wrapper.py @@ -1,9 +1,6 @@ # -*- coding: utf-8 -*- -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import six diff --git a/tests/test_createrepophase.py b/tests/test_createrepophase.py index 11d641b1..8c6d7253 100644 --- a/tests/test_createrepophase.py +++ b/tests/test_createrepophase.py @@ -1,12 +1,8 @@ # -*- coding: utf-8 -*- -try: - import unittest2 as unittest -except ImportError: - import unittest - import glob import os +import unittest try: from unittest import mock diff --git a/tests/test_fus_wrapper.py b/tests/test_fus_wrapper.py index 5516fc5a..4bb3083c 100644 --- a/tests/test_fus_wrapper.py +++ b/tests/test_fus_wrapper.py @@ -1,9 +1,6 @@ # -*- coding: utf-8 -*- -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import tempfile from textwrap import dedent diff --git a/tests/test_gather.py b/tests/test_gather.py index 51fda80e..d97a4ee8 100644 --- a/tests/test_gather.py +++ b/tests/test_gather.py @@ -1,17 +1,12 @@ # -*- coding: utf-8 -*- -try: - import unittest2 as unittest -except ImportError: - import unittest - - +import logging import os -import tempfile import shutil import six import sys -import logging +import tempfile +import unittest from six.moves import cStringIO diff --git a/tests/test_gather_phase.py b/tests/test_gather_phase.py index 5bc6ec8d..57ea83a0 100644 --- a/tests/test_gather_phase.py +++ b/tests/test_gather_phase.py @@ -9,10 +9,7 @@ try: except ImportError: import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import six diff --git a/tests/test_gather_source_module.py b/tests/test_gather_source_module.py index e5f0d376..a4068656 100644 --- a/tests/test_gather_source_module.py +++ b/tests/test_gather_source_module.py @@ -1,9 +1,6 @@ # -*- coding: utf-8 -*- -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest try: from unittest import mock diff --git a/tests/test_graph.py b/tests/test_graph.py index 0ca9863f..2e2e847b 100644 --- a/tests/test_graph.py +++ b/tests/test_graph.py @@ -1,9 +1,6 @@ # -*- coding: utf-8 -*- -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest from pungi.graph import SimpleAcyclicOrientedGraph diff --git a/tests/test_imagechecksumphase.py b/tests/test_imagechecksumphase.py index d5193849..50187324 100644 --- a/tests/test_imagechecksumphase.py +++ b/tests/test_imagechecksumphase.py @@ -1,17 +1,14 @@ # -*- coding: utf-8 -*- -try: - import unittest2 as unittest -except ImportError: - import unittest try: from unittest import mock except ImportError: import mock import os -import tempfile import shutil +import tempfile +import unittest from pungi.phases.image_checksum import ImageChecksumPhase, dump_checksums from tests.helpers import DummyCompose, PungiTestCase diff --git a/tests/test_initphase.py b/tests/test_initphase.py index 1fb1c105..0edf37b4 100644 --- a/tests/test_initphase.py +++ b/tests/test_initphase.py @@ -1,10 +1,8 @@ # -*- coding: utf-8 -*- -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest + try: from unittest import mock except ImportError: diff --git a/tests/test_iso_wrapper.py b/tests/test_iso_wrapper.py index 04c0eb8f..d8ab7d11 100644 --- a/tests/test_iso_wrapper.py +++ b/tests/test_iso_wrapper.py @@ -8,11 +8,7 @@ except ImportError: import mock import os import six - -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest from pungi.wrappers import iso diff --git a/tests/test_koji_wrapper.py b/tests/test_koji_wrapper.py index 3412a87d..abb82176 100644 --- a/tests/test_koji_wrapper.py +++ b/tests/test_koji_wrapper.py @@ -7,10 +7,7 @@ try: except ImportError: import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import tempfile import os diff --git a/tests/test_lorax_wrapper.py b/tests/test_lorax_wrapper.py index 3eb6f535..bdbc400a 100644 --- a/tests/test_lorax_wrapper.py +++ b/tests/test_lorax_wrapper.py @@ -1,9 +1,6 @@ # -*- coding: utf-8 -*- -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import six diff --git a/tests/test_media_split.py b/tests/test_media_split.py index a8f2d971..320f196a 100644 --- a/tests/test_media_split.py +++ b/tests/test_media_split.py @@ -1,9 +1,7 @@ # -*- coding: utf-8 -*- -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest + try: from unittest import mock except ImportError: diff --git a/tests/test_module_util.py b/tests/test_module_util.py index 0d083af0..d879655c 100644 --- a/tests/test_module_util.py +++ b/tests/test_module_util.py @@ -1,9 +1,6 @@ import os -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest from parameterized import parameterized from pungi import module_util diff --git a/tests/test_notifier.py b/tests/test_notifier.py index 41c2c28a..fd62aea1 100644 --- a/tests/test_notifier.py +++ b/tests/test_notifier.py @@ -8,10 +8,7 @@ try: except ImportError: import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest from pungi.notifier import PungiNotifier diff --git a/tests/test_patch_iso.py b/tests/test_patch_iso.py index addf523e..9927c0e5 100644 --- a/tests/test_patch_iso.py +++ b/tests/test_patch_iso.py @@ -4,12 +4,9 @@ try: from unittest import mock except ImportError: import mock -import os -try: - import unittest2 as unittest -except ImportError: - import unittest +import os +import unittest from tests.helpers import boom, touch, copy_fixture from pungi_utils import patch_iso diff --git a/tests/test_phase_base.py b/tests/test_phase_base.py index f2719b12..ac81b2a0 100644 --- a/tests/test_phase_base.py +++ b/tests/test_phase_base.py @@ -5,10 +5,7 @@ try: except ImportError: import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import random import time diff --git a/tests/test_pkgset_pkgsets.py b/tests/test_pkgset_pkgsets.py index 823cdd3e..2b83e4f2 100644 --- a/tests/test_pkgset_pkgsets.py +++ b/tests/test_pkgset_pkgsets.py @@ -7,10 +7,7 @@ except ImportError: import os import six -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import json import tempfile import re diff --git a/tests/test_pkgset_source_koji.py b/tests/test_pkgset_source_koji.py index ce550ea4..260970a0 100644 --- a/tests/test_pkgset_source_koji.py +++ b/tests/test_pkgset_source_koji.py @@ -9,11 +9,7 @@ except ImportError: import os import re import six - -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest from pungi.phases.pkgset.sources import source_koji from tests import helpers diff --git a/tests/test_repoclosure_phase.py b/tests/test_repoclosure_phase.py index 2cc61626..4fad10da 100644 --- a/tests/test_repoclosure_phase.py +++ b/tests/test_repoclosure_phase.py @@ -1,9 +1,6 @@ # -*- coding: utf-8 -*- -try: - from unittest import mock -except ImportError: - import mock +from unittest import mock import six import pungi.phases.repoclosure as repoclosure_phase diff --git a/tests/test_scm.py b/tests/test_scm.py index d6b50a8d..da2193e0 100644 --- a/tests/test_scm.py +++ b/tests/test_scm.py @@ -5,15 +5,12 @@ try: except ImportError: import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import os +import random import shutil import tempfile -import random +import unittest -import os import six from parameterized import parameterized diff --git a/tests/test_util.py b/tests/test_util.py index afda1e55..1e60b0d6 100644 --- a/tests/test_util.py +++ b/tests/test_util.py @@ -8,10 +8,7 @@ except ImportError: import mock import os -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import tempfile import shutil import subprocess diff --git a/tests/test_variant_wrapper.py b/tests/test_variant_wrapper.py index 83f2d251..1a035f5e 100644 --- a/tests/test_variant_wrapper.py +++ b/tests/test_variant_wrapper.py @@ -1,9 +1,6 @@ # -*- coding: utf-8 -*- -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest from six.moves import cStringIO from pungi.wrappers.variants import VariantsXmlParser