Python 2.6: drop unittest conditionals

The unittest standard library on Python 2.7 an later has everything
that the unittest2 backport is supposed to have.  Let's then drop all
the conditional imports of unittest2 and stick with unittest.
Signed-off-by: NCleber Rosa <crosa@redhat.com>

avocado/core/test.py

@@ -26,6 +26,7 @@ import re
 import shutil
 import sys
 import time
+import unittest
 
 from . import data_dir
 from . import exceptions
@@ -42,11 +43,6 @@ from ..utils import stacktrace
 from .settings import settings
 from .version import VERSION
 
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
-
 
 #: Environment variable used to store the location of a temporary
 #: directory which is preserved across all tests execution (usually in

selftests/doc/test_doc_build.py

@@ -4,13 +4,8 @@ Build documentation and report whether we had warning/error messages.
 This is geared towards documentation build regression testing.
 """
 import os
-import sys
 import urllib
-
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
+import unittest
 
 from avocado.utils import process
 

selftests/functional/test_argument_parsing.py

 import os
-import sys
 import glob
-
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
+import unittest
 
 from avocado.core import data_dir
 from avocado.core import job_id

selftests/functional/test_basic.py

@@ -11,14 +11,10 @@ import tempfile
 import time
 import xml.dom.minidom
 import zipfile
+import unittest
 
 import pkg_resources
 
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
-
 from avocado.core import exit_codes
 from avocado.utils import astring
 from avocado.utils import process

selftests/functional/test_export_variables.py

 import os
-import sys
 import tempfile
 import shutil
-
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
+import unittest
 
 from avocado import VERSION
 from avocado.core import exit_codes

selftests/functional/test_gdb.py

 import os
-import sys
 import shutil
 import tempfile
-
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
+import unittest
 
 from avocado.utils import process
 

selftests/functional/test_interrupt.py

 import os
-import sys
 import tempfile
 import time
 import shutil
 import stat
+import unittest
 
 import aexpect
 import psutil
 
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
-
 from avocado.utils import wait
 from avocado.utils import script
 from avocado.utils import data_factory

selftests/functional/test_job_timeout.py

 import glob
 import os
-import sys
 import tempfile
 import shutil
 import xml.dom.minidom
-
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
+import unittest
 
 from avocado.core import exit_codes
 from avocado.utils import process

selftests/functional/test_journal.py

 import os
-import sys
 import json
 import sqlite3
 import tempfile
 import shutil
-
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
+import unittest
 
 from avocado.core import exit_codes
 from avocado.utils import process

selftests/functional/test_loader.py

 import os
-import sys
 import subprocess
 import time
 import stat
 import tempfile
 import shutil
 import signal
-
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
+import unittest
 
 from avocado.core import exit_codes
 from avocado.utils import script

selftests/functional/test_lv_utils.py

@@ -7,17 +7,10 @@ from avocado.utils import process, lv_utils
 import glob
 import os
 import shutil
-import sys
 import tempfile
 import unittest
 
 
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
-
-
 class LVUtilsTest(unittest.TestCase):
 
     """

selftests/functional/test_multiplex.py

 #!/usr/bin/env python
 
 import os
-import sys
 import tempfile
 import shutil
-
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
+import unittest
 
 from avocado.core import exit_codes
 from avocado.utils import process

selftests/functional/test_output.py

@@ -2,17 +2,12 @@ import json
 import tempfile
 import os
 import re
-import sys
 import shutil
+import unittest
 from xml.dom import minidom
 
 import pkg_resources
 
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
-
 from avocado.core import exit_codes
 from avocado.core.output import TermSupport
 from avocado.utils import process

selftests/functional/test_output_check.py

 import os
-import sys
 import tempfile
 import shutil
-
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
+import unittest
 
 from avocado.core import exit_codes
 from avocado.utils import process

selftests/functional/test_plugin_diff.py

@@ -2,14 +2,9 @@
 
 import glob
 import os
-import sys
 import tempfile
 import shutil
-
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
+import unittest
 
 from avocado.core import exit_codes
 from avocado.utils import process

selftests/functional/test_plugin_jobscripts.py

 import os
 import shutil
-import sys
 import tempfile
-
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
+import unittest
 
 from avocado.core import exit_codes
 from avocado.utils import process

selftests/functional/test_replay_basic.py

@@ -2,14 +2,9 @@
 
 import glob
 import os
-import sys
 import tempfile
 import shutil
-
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
+import unittest
 
 from avocado.core import exit_codes
 from avocado.utils import process

selftests/functional/test_replay_external_runner.py

@@ -2,14 +2,9 @@
 
 import glob
 import os
-import sys
 import tempfile
 import shutil
-
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
+import unittest
 
 from avocado.core import exit_codes
 from avocado.utils import process

selftests/functional/test_replay_failfast.py

@@ -2,14 +2,9 @@
 
 import glob
 import os
-import sys
 import tempfile
 import shutil
-
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
+import unittest
 
 from avocado.core import exit_codes
 from avocado.utils import process

selftests/functional/test_skiptests.py

 import json
 import os
 import shutil
-import sys
 import tempfile
-
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
+import unittest
 
 from avocado.core import exit_codes
 from avocado.utils import process

selftests/functional/test_standalone.py

 import os
-import sys
-
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
+import unittest
 
 from avocado.core import exit_codes
 from avocado.utils import process

selftests/functional/test_streams.py

 import os
 import shutil
-import sys
 import tempfile
-
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
+import unittest
 
 from avocado.core import exit_codes
 from avocado.utils import process

selftests/functional/test_sysinfo.py

 import os
-import sys
 import shutil
 import tempfile
-
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
+import unittest
 
 from avocado.core import exit_codes
 from avocado.utils import process

selftests/functional/test_teststmpdir.py

 #!/usr/bin/env python
 
 import os
-import sys
 import tempfile
 import shutil
-
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
+import unittest
 
 from avocado.core import exit_codes
 from avocado.core import test

selftests/functional/test_thirdparty_bugs.py

 import json
-import sys
-from avocado.utils import download
+import unittest
+import urllib2
 
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
+from avocado.utils import download
 
 
 class TestThirdPartyBugs(unittest.TestCase):
@@ -25,7 +22,7 @@ class TestThirdPartyBugs(unittest.TestCase):
                              'change the avocado.conf option '
                              '"reject_unknown_hosts" defaults to True.' %
                              'https://github.com/paramiko/paramiko/issues/243')
-        except download.urllib2.URLError as details:
+        except urllib2.URLError as details:
             raise unittest.SkipTest(details)
 
 

selftests/functional/test_unittest_compat.py

@@ -2,11 +2,7 @@ import os
 import sys
 import shutil
 import tempfile
-
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
+import unittest
 
 from avocado.utils import script
 from avocado.utils import process

selftests/functional/test_utils.py

@@ -6,16 +6,10 @@ import stat
 import sys
 import tempfile
 import time
+import unittest
 
 from avocado.utils.filelock import FileLock
 from avocado.utils.stacktrace import prepare_exc_info
-
-
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
-
 from avocado.utils import process
 
 

selftests/functional/test_wrapper.py

 import os
-import sys
 import tempfile
 import shutil
-
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
+import unittest
 
 from avocado.core import exit_codes
 from avocado.utils import process
 from avocado.utils import script
 from avocado.utils import path as utils_path
 
+
 basedir = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', '..')
 basedir = os.path.abspath(basedir)
 

selftests/run

@@ -6,12 +6,7 @@ __author__ = 'Lucas Meneghel Rodrigues <lmr@redhat.com>'
 import os
 import sys
 import logging
-
-
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
+import unittest
 
 logger = logging.getLogger(__name__)
 

selftests/unit/test_data_structures.py

-import sys
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
+import unittest
 
 from avocado.utils import data_structures
 

selftests/unit/test_dispatcher.py

-import sys
-
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
+import unittest
 
 from avocado.core import dispatcher
 

selftests/unit/test_job.py

 import argparse
 import os
 import shutil
-import sys
 import tempfile
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
+import unittest
 
 from avocado.core import exceptions
 from avocado.core import test

selftests/unit/test_loader.py

 import shutil
 import stat
-import sys
 import multiprocessing
 import tempfile
-
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
+import unittest
 
 from avocado.core import test
 from avocado.core import exceptions

selftests/unit/test_mux.py

 import copy
 import itertools
 import pickle
-import sys
+import unittest
 
 from avocado.core import mux, tree, varianter
 from avocado.plugins import yaml_to_mux
 
 
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
 if __name__ == "__main__":
     PATH_PREFIX = "../../../../"
 else:

selftests/unit/test_parser.py

 import argparse
-import sys
-
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
+import unittest
 
 from avocado.core import parser
 

selftests/unit/test_result.py

-import sys
 import argparse
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
+import unittest
 
 from avocado.core.result import Result
 

selftests/unit/test_safeloader.py

 import ast
 import re
-import sys
-
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
+import unittest
 
 from avocado.core import safeloader
 from avocado.utils import script

selftests/unit/test_settings.py

 import os
-import sys
 import tempfile
-
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
+import unittest
 
 from avocado.core import settings
 

selftests/unit/test_sysinfo.py

 import os
-import sys
 import tempfile
 import shutil
-
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
+import unittest
 
 from avocado.core import sysinfo
 

selftests/unit/test_test.py

 import os
 import shutil
-import sys
 import tempfile
-from flexmock import flexmock, flexmock_teardown
+import unittest
 
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
+from flexmock import flexmock, flexmock_teardown
 
 from avocado.core import test, exceptions
 from avocado.utils import script

selftests/unit/test_utils_iso9660.py

@@ -3,18 +3,12 @@ Verifies the avocado.utils.iso9660 functionality
 """
 import os
 import shutil
-import sys
 import tempfile
+import unittest
 
 from avocado.utils import iso9660, process
 
 
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
-
-
 class BaseIso9660(unittest.TestCase):
 
     """

selftests/unit/test_utils_partition.py

@@ -6,20 +6,15 @@ avocado.utils.partition unittests
 
 import os
 import shutil
-import sys
 import tempfile
 import time
+import unittest     # pylint: disable=C0411
 
 from flexmock import flexmock, flexmock_teardown
 
 from avocado.utils import partition, process
 from avocado.utils import path as utils_path
 
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest    # pylint: disable=E0401
-else:
-    import unittest     # pylint: disable=C0411
-
 
 def missing_binary(binary):
     try:

selftests/unit/test_utils_process.py

 import os
-import sys
+import unittest
 from mock import MagicMock, patch
 
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
-
 from avocado.utils import gdb
 from avocado.utils import process
 from avocado.utils import path

selftests/unit/test_utils_service.py

@@ -16,12 +16,7 @@
 #  The full GNU General Public License is included in this distribution in
 #  the file called "COPYING".
 
-import sys
-
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
+import unittest
 
 from mock import MagicMock, patch