Drop unittest2

The library is imported if available, but we never build it in any
environment where the package would be installed. It was last used for
RHEL 6 builds.

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>

(cherry picked from commit d95d1f59e2ae243ea794c5f5613fef3249b4fad6)

test-requirements.txt

@@ -2,4 +2,3 @@ mock; python_version < '3.3'
 parameterized
 pytest
 pytest-cov
-unittest2; python_version < '3.0'

tests/helpers.py

@@ -12,10 +12,7 @@ from unittest import mock
 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

tests/test_arguments.py

@@ -1,9 +1,6 @@
 from unittest import mock
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 import six
 
 from pungi.scripts.pungi_koji import cli_main

tests/test_buildinstall.py

@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from unittest import mock
 import six

tests/test_checks.py

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

tests/test_compose.py

@@ -3,15 +3,12 @@
 import logging
 from unittest 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
 

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
 

tests/test_config.py

@@ -1,10 +1,6 @@
 # -*- coding: utf-8 -*-
 
-
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 import six
 from unittest import mock

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
 

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
 

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
 
 from unittest import mock
 import six

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
 

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
 

tests/test_gather_phase.py

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

tests/test_gather_source_module.py

@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from unittest import mock
 import six

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
 

tests/test_imagechecksumphase.py

@@ -1,14 +1,14 @@
 # -*- coding: utf-8 -*-
 
 try:
-    import unittest2 as unittest
+    from unittest import mock
 except ImportError:
-    import unittest
-from unittest import mock
+    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

tests/test_initphase.py

@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
 
 
+import unittest
+
 try:
-    import unittest2 as unittest
+    from unittest import mock
 except ImportError:
-    import unittest
-from unittest import mock
+    import mock
 
 import six
 

tests/test_iso_wrapper.py

@@ -4,11 +4,7 @@ import itertools
 from unittest import mock
 import os
 import six
-
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from pungi.wrappers import iso
 

tests/test_koji_wrapper.py

@@ -3,10 +3,7 @@
 import json
 from unittest import mock
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 import tempfile
 
 import os

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
 

tests/test_media_split.py

@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
 
+import unittest
+
 try:
-    import unittest2 as unittest
+    from unittest import mock
 except ImportError:
-    import unittest
-from unittest import mock
+    import mock
 
 from pungi import media_split
 

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

tests/test_notifier.py

@@ -4,10 +4,7 @@ from datetime import datetime
 import json
 from unittest import mock
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from pungi.notifier import PungiNotifier
 

tests/test_patch_iso.py

@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
-from unittest import mock
-import os
-
 try:
-    import unittest2 as unittest
+    from unittest import mock
 except ImportError:
-    import unittest
+    import mock
+
+import os
+import unittest
 
 from tests.helpers import boom, touch, copy_fixture
 from pungi_utils import patch_iso

tests/test_phase_base.py

@@ -2,10 +2,7 @@
 
 from unittest import mock
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 import random
 import time
 

tests/test_pkgset_pkgsets.py

@@ -5,10 +5,7 @@ from unittest import mock
 import os
 import six
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 import json
 import tempfile
 import re

tests/test_pkgset_source_koji.py

@@ -1,14 +1,17 @@
 # -*- coding: utf-8 -*-
 
 import json
-import unittest
-from unittest import mock
+
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import os
 import re
 import six
+import unittest
 from ddt import ddt, data, unpack
 from typing import AnyStr, List, Set, Dict, Tuple
-
 from tests.test_gather_method_hybrid import MockModule
 
 from pungi.phases.pkgset.sources import source_koji, source_kojimock

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

tests/test_scm.py

@@ -2,15 +2,12 @@
 
 from unittest 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

tests/test_util.py

@@ -4,10 +4,7 @@ import argparse
 from unittest import mock
 import os
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 import tempfile
 import shutil
 import subprocess

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