diff --git a/build-scripts/build_all_guides.py b/build-scripts/build_all_guides.py index 3cce8d293950..45a8af0d166f 100755 --- a/build-scripts/build_all_guides.py +++ b/build-scripts/build_all_guides.py @@ -1,7 +1,5 @@ #!/usr/bin/python3 -from __future__ import print_function - """ Takes given XCCDF or data stream and for every profile in it it generates one OpenSCAP HTML guide. Also generates an index file that lists all the profiles diff --git a/build-scripts/build_sce.py b/build-scripts/build_sce.py index 25a99210c64a..2fc857e20f6a 100755 --- a/build-scripts/build_sce.py +++ b/build-scripts/build_sce.py @@ -26,7 +26,6 @@ will fail to interpret (thinking it is XML)! """ -from __future__ import print_function import argparse diff --git a/build-scripts/build_templated_content.py b/build-scripts/build_templated_content.py index eebf79647635..bb3f49b619ce 100644 --- a/build-scripts/build_templated_content.py +++ b/build-scripts/build_templated_content.py @@ -1,6 +1,5 @@ #!/usr/bin/python3 -from __future__ import print_function import argparse diff --git a/build-scripts/build_xccdf.py b/build-scripts/build_xccdf.py index 2711dea2f527..8ec32e4d33e1 100644 --- a/build-scripts/build_xccdf.py +++ b/build-scripts/build_xccdf.py @@ -1,6 +1,5 @@ #!/usr/bin/python3 -from __future__ import print_function import argparse import os diff --git a/build-scripts/compile_all.py b/build-scripts/compile_all.py index 40ff00b7a206..80ca511e158b 100644 --- a/build-scripts/compile_all.py +++ b/build-scripts/compile_all.py @@ -1,4 +1,3 @@ -from __future__ import print_function import argparse import os.path diff --git a/build-scripts/cpe_generate.py b/build-scripts/cpe_generate.py index e3c5e9acbcee..837578e78fa5 100755 --- a/build-scripts/cpe_generate.py +++ b/build-scripts/cpe_generate.py @@ -1,6 +1,5 @@ #!/usr/bin/python3 -from __future__ import print_function import sys import os diff --git a/build-scripts/enable_derivatives.py b/build-scripts/enable_derivatives.py index 3d83aae9ea2a..5553c8f493e2 100755 --- a/build-scripts/enable_derivatives.py +++ b/build-scripts/enable_derivatives.py @@ -1,6 +1,5 @@ #!/usr/bin/python3 -from __future__ import print_function """ Takes given XCCDF or data stream and adds RHEL derivative operating system(s) CPE name next diff --git a/build-scripts/expand_jinja.py b/build-scripts/expand_jinja.py index 086c49503dc4..284af36985ff 100644 --- a/build-scripts/expand_jinja.py +++ b/build-scripts/expand_jinja.py @@ -1,4 +1,3 @@ -from __future__ import print_function import os import sys diff --git a/build-scripts/generate_man_page.py b/build-scripts/generate_man_page.py index e144a9f5a5bb..daaa987b1f39 100755 --- a/build-scripts/generate_man_page.py +++ b/build-scripts/generate_man_page.py @@ -1,6 +1,5 @@ #!/usr/bin/python3 -from __future__ import print_function import argparse import ssg.build_profile diff --git a/build-scripts/generate_manifest.py b/build-scripts/generate_manifest.py index e40c68783830..42844a4b804a 100644 --- a/build-scripts/generate_manifest.py +++ b/build-scripts/generate_manifest.py @@ -1,4 +1,3 @@ -from __future__ import print_function import os import json diff --git a/build-scripts/profile_tool.py b/build-scripts/profile_tool.py index 235f0f48dd45..815fc187edbf 100755 --- a/build-scripts/profile_tool.py +++ b/build-scripts/profile_tool.py @@ -1,6 +1,5 @@ #!/usr/bin/python3 -from __future__ import print_function import argparse diff --git a/build-scripts/verify_references.py b/build-scripts/verify_references.py index 882b8d2b868b..dcf68b7fd555 100755 --- a/build-scripts/verify_references.py +++ b/build-scripts/verify_references.py @@ -1,6 +1,5 @@ #!/usr/bin/python3 -from __future__ import print_function import sys import optparse diff --git a/shared/templates/firefox_policy-setting/template.py b/shared/templates/firefox_policy-setting/template.py index df2587918e32..9d77d9698299 100644 --- a/shared/templates/firefox_policy-setting/template.py +++ b/shared/templates/firefox_policy-setting/template.py @@ -1,4 +1,3 @@ -from __future__ import print_function import re import json diff --git a/ssg/ansible.py b/ssg/ansible.py index 4a92ba3b0c68..3eb3eca83e5f 100644 --- a/ssg/ansible.py +++ b/ssg/ansible.py @@ -3,7 +3,6 @@ """ from __future__ import absolute_import -from __future__ import print_function import collections import copy diff --git a/ssg/build_cpe.py b/ssg/build_cpe.py index b29ae2d59a6f..dfba1a06090e 100644 --- a/ssg/build_cpe.py +++ b/ssg/build_cpe.py @@ -3,7 +3,6 @@ """ from __future__ import absolute_import -from __future__ import print_function import os import sys diff --git a/ssg/build_derivatives.py b/ssg/build_derivatives.py index e090b7106373..0e08ff82d886 100644 --- a/ssg/build_derivatives.py +++ b/ssg/build_derivatives.py @@ -3,7 +3,6 @@ """ from __future__ import absolute_import -from __future__ import print_function import re from .xml import ElementTree diff --git a/ssg/build_guides.py b/ssg/build_guides.py index c13f920be794..15eab17758a7 100644 --- a/ssg/build_guides.py +++ b/ssg/build_guides.py @@ -1,5 +1,4 @@ from __future__ import absolute_import -from __future__ import print_function import os import sys diff --git a/ssg/build_profile.py b/ssg/build_profile.py index b3076fce2339..f881cfeafc00 100644 --- a/ssg/build_profile.py +++ b/ssg/build_profile.py @@ -1,5 +1,4 @@ from __future__ import absolute_import -from __future__ import print_function import os import sys diff --git a/ssg/build_remediations.py b/ssg/build_remediations.py index 3756992c7825..8ce637eff8fe 100644 --- a/ssg/build_remediations.py +++ b/ssg/build_remediations.py @@ -1,5 +1,4 @@ from __future__ import absolute_import -from __future__ import print_function import sys import os diff --git a/ssg/build_renumber.py b/ssg/build_renumber.py index 745a086599c0..11ef6d961346 100644 --- a/ssg/build_renumber.py +++ b/ssg/build_renumber.py @@ -1,5 +1,4 @@ from __future__ import absolute_import -from __future__ import print_function import sys import os from typing import Optional diff --git a/ssg/build_sce.py b/ssg/build_sce.py index 6883146b1958..3545ae26b6e0 100644 --- a/ssg/build_sce.py +++ b/ssg/build_sce.py @@ -1,5 +1,4 @@ from __future__ import absolute_import -from __future__ import print_function import os import os.path diff --git a/ssg/build_stig.py b/ssg/build_stig.py index 03736e1b5a59..d812ff18ebe9 100644 --- a/ssg/build_stig.py +++ b/ssg/build_stig.py @@ -1,5 +1,4 @@ from __future__ import absolute_import -from __future__ import print_function import os import sys diff --git a/ssg/build_yaml.py b/ssg/build_yaml.py index 274c3efd1ac1..39b428979355 100644 --- a/ssg/build_yaml.py +++ b/ssg/build_yaml.py @@ -4,7 +4,6 @@ """ from __future__ import absolute_import -from __future__ import print_function from copy import deepcopy import datetime diff --git a/ssg/checks.py b/ssg/checks.py index 7846c19e7962..76324cb8ca99 100644 --- a/ssg/checks.py +++ b/ssg/checks.py @@ -3,7 +3,6 @@ """ from __future__ import absolute_import -from __future__ import print_function import os diff --git a/ssg/components.py b/ssg/components.py index 54d85352298c..f7098cff206e 100644 --- a/ssg/components.py +++ b/ssg/components.py @@ -2,7 +2,6 @@ Common functions for processing Components in SSG """ -from __future__ import print_function from collections import defaultdict import os diff --git a/ssg/constants.py b/ssg/constants.py index 53a6604e3d28..f104ecec2c34 100644 --- a/ssg/constants.py +++ b/ssg/constants.py @@ -1,5 +1,4 @@ from __future__ import absolute_import -from __future__ import print_function import os.path import os diff --git a/ssg/contributors.py b/ssg/contributors.py index 7e8f9e182f2f..2abc9fb4684a 100644 --- a/ssg/contributors.py +++ b/ssg/contributors.py @@ -3,7 +3,6 @@ """ from __future__ import absolute_import -from __future__ import print_function import collections import datetime diff --git a/ssg/entities/common.py b/ssg/entities/common.py index aecac8a60ffa..53ec63f074de 100644 --- a/ssg/entities/common.py +++ b/ssg/entities/common.py @@ -1,5 +1,4 @@ from __future__ import absolute_import -from __future__ import print_function import json import os diff --git a/ssg/environment.py b/ssg/environment.py index 915706a56289..450d4175aace 100644 --- a/ssg/environment.py +++ b/ssg/environment.py @@ -3,7 +3,6 @@ """ from __future__ import absolute_import -from __future__ import print_function from .products import load_product_yaml diff --git a/ssg/fixes.py b/ssg/fixes.py index ddad90d560f1..230415e3f639 100644 --- a/ssg/fixes.py +++ b/ssg/fixes.py @@ -3,7 +3,6 @@ """ from __future__ import absolute_import -from __future__ import print_function import os diff --git a/ssg/id_translate.py b/ssg/id_translate.py index 39f99aaa8c7c..aaaddc78040a 100644 --- a/ssg/id_translate.py +++ b/ssg/id_translate.py @@ -3,7 +3,6 @@ """ from __future__ import absolute_import -from __future__ import print_function from .xml import ElementTree from .constants import oval_namespace as oval_ns diff --git a/ssg/jinja.py b/ssg/jinja.py index 414e1bcfdd56..50e55b8c847e 100644 --- a/ssg/jinja.py +++ b/ssg/jinja.py @@ -3,7 +3,6 @@ """ from __future__ import absolute_import -from __future__ import print_function import os.path import sys diff --git a/ssg/oval.py b/ssg/oval.py index 81baadb49a4f..33700044ba49 100644 --- a/ssg/oval.py +++ b/ssg/oval.py @@ -3,7 +3,6 @@ """ from __future__ import absolute_import -from __future__ import print_function import sys import os diff --git a/ssg/parse_oval.py b/ssg/parse_oval.py index 4efe02c6b885..d5529c0a9a36 100644 --- a/ssg/parse_oval.py +++ b/ssg/parse_oval.py @@ -3,7 +3,6 @@ """ from __future__ import absolute_import -from __future__ import print_function from .xml import ElementTree as ET diff --git a/ssg/products.py b/ssg/products.py index 25cb41c37768..4c1e0c65367d 100644 --- a/ssg/products.py +++ b/ssg/products.py @@ -3,7 +3,6 @@ """ from __future__ import absolute_import -from __future__ import print_function import os import yaml diff --git a/ssg/profiles.py b/ssg/profiles.py index ee3e0fb1e2ad..84c30f277f7c 100644 --- a/ssg/profiles.py +++ b/ssg/profiles.py @@ -1,5 +1,4 @@ from __future__ import absolute_import -from __future__ import print_function import os import sys diff --git a/ssg/rule_dir_stats.py b/ssg/rule_dir_stats.py index d866a8254463..88a46a126a2e 100644 --- a/ssg/rule_dir_stats.py +++ b/ssg/rule_dir_stats.py @@ -5,7 +5,6 @@ """ from __future__ import absolute_import -from __future__ import print_function import os from collections import defaultdict diff --git a/ssg/rule_yaml.py b/ssg/rule_yaml.py index bae5058f2ff9..d0c308004a43 100644 --- a/ssg/rule_yaml.py +++ b/ssg/rule_yaml.py @@ -4,7 +4,6 @@ """ from __future__ import absolute_import -from __future__ import print_function import os import sys diff --git a/ssg/rules.py b/ssg/rules.py index 72bcc31f1f79..b29a2e18e09a 100644 --- a/ssg/rules.py +++ b/ssg/rules.py @@ -3,7 +3,6 @@ """ from __future__ import absolute_import -from __future__ import print_function import os diff --git a/ssg/shims.py b/ssg/shims.py index 388ae1b492ed..b688420ead27 100644 --- a/ssg/shims.py +++ b/ssg/shims.py @@ -1,5 +1,4 @@ from __future__ import absolute_import -from __future__ import print_function import subprocess diff --git a/ssg/templates.py b/ssg/templates.py index 696295ad54e2..883382462c05 100644 --- a/ssg/templates.py +++ b/ssg/templates.py @@ -3,7 +3,6 @@ """ from __future__ import absolute_import -from __future__ import print_function import os import glob diff --git a/ssg/utils.py b/ssg/utils.py index 752a7d04c7b8..28af6f2ec3f8 100644 --- a/ssg/utils.py +++ b/ssg/utils.py @@ -3,7 +3,6 @@ """ from __future__ import absolute_import -from __future__ import print_function import multiprocessing import os diff --git a/ssg/variables.py b/ssg/variables.py index 0219772fe543..b5da786fe59f 100644 --- a/ssg/variables.py +++ b/ssg/variables.py @@ -1,5 +1,4 @@ from __future__ import absolute_import -from __future__ import print_function import glob import os diff --git a/ssg/xccdf.py b/ssg/xccdf.py index 0dce07e7b409..93b714fb738d 100644 --- a/ssg/xccdf.py +++ b/ssg/xccdf.py @@ -6,7 +6,6 @@ """ from __future__ import absolute_import -from __future__ import print_function import re diff --git a/ssg/xml.py b/ssg/xml.py index 9f75e67030ba..60a052ccc369 100644 --- a/ssg/xml.py +++ b/ssg/xml.py @@ -3,7 +3,6 @@ """ from __future__ import absolute_import -from __future__ import print_function import collections import platform diff --git a/ssg/yaml.py b/ssg/yaml.py index c2e576a733bb..d356c39f3a68 100644 --- a/ssg/yaml.py +++ b/ssg/yaml.py @@ -3,7 +3,6 @@ """ from __future__ import absolute_import -from __future__ import print_function import re import sys diff --git a/tests/assert_ansible_schema.py b/tests/assert_ansible_schema.py index a3c278b7c27a..96dfe81d04e3 100644 --- a/tests/assert_ansible_schema.py +++ b/tests/assert_ansible_schema.py @@ -1,6 +1,5 @@ #!/usr/bin/python3 -from __future__ import print_function import argparse import re diff --git a/tests/automatus.py b/tests/automatus.py index ece63a1cb2b7..560a938323f0 100755 --- a/tests/automatus.py +++ b/tests/automatus.py @@ -1,5 +1,4 @@ #!/usr/bin/python3 -from __future__ import print_function import argparse import contextlib diff --git a/tests/common/stability.py b/tests/common/stability.py index bd013dd29b08..d7fdbc8a309b 100644 --- a/tests/common/stability.py +++ b/tests/common/stability.py @@ -1,4 +1,3 @@ -from __future__ import print_function import sys diff --git a/tests/ensure_paths_are_short.py b/tests/ensure_paths_are_short.py index 9987f6db1db2..db7bdd912b2d 100755 --- a/tests/ensure_paths_are_short.py +++ b/tests/ensure_paths_are_short.py @@ -1,6 +1,5 @@ #!/usr/bin/python3 -from __future__ import print_function import os import sys diff --git a/tests/missing_cces.py b/tests/missing_cces.py index 53e0d3236e8f..3cfde0ad8a43 100644 --- a/tests/missing_cces.py +++ b/tests/missing_cces.py @@ -1,4 +1,3 @@ -from __future__ import print_function import argparse import os.path diff --git a/tests/oval_tester.py b/tests/oval_tester.py index d535939fa147..853c55494568 100644 --- a/tests/oval_tester.py +++ b/tests/oval_tester.py @@ -1,6 +1,5 @@ #!/usr/bin/python3 -from __future__ import print_function import os import re diff --git a/tests/run_scapval.py b/tests/run_scapval.py index 856ed9cf265b..b36e0502a16e 100755 --- a/tests/run_scapval.py +++ b/tests/run_scapval.py @@ -1,5 +1,4 @@ #!/usr/bin/python3 -from __future__ import print_function import argparse import subprocess diff --git a/tests/ssg_test_suite/combined.py b/tests/ssg_test_suite/combined.py index 0605a4d3e825..69f065317515 100644 --- a/tests/ssg_test_suite/combined.py +++ b/tests/ssg_test_suite/combined.py @@ -1,5 +1,4 @@ #!/usr/bin/python3 -from __future__ import print_function import logging import re diff --git a/tests/ssg_test_suite/common.py b/tests/ssg_test_suite/common.py index 4d701ec1bcc3..6fd2eca3a8c4 100644 --- a/tests/ssg_test_suite/common.py +++ b/tests/ssg_test_suite/common.py @@ -1,4 +1,3 @@ -from __future__ import print_function import functools import logging diff --git a/tests/ssg_test_suite/log.py b/tests/ssg_test_suite/log.py index e5be24f260bc..e924876d5e42 100644 --- a/tests/ssg_test_suite/log.py +++ b/tests/ssg_test_suite/log.py @@ -1,4 +1,3 @@ -from __future__ import print_function import logging import os diff --git a/tests/ssg_test_suite/oscap.py b/tests/ssg_test_suite/oscap.py index be1c66734bf2..c828e7eac95f 100644 --- a/tests/ssg_test_suite/oscap.py +++ b/tests/ssg_test_suite/oscap.py @@ -1,5 +1,4 @@ #!/usr/bin/python3 -from __future__ import print_function import collections import datetime @@ -7,9 +6,6 @@ import logging import os.path import re -import socket -import subprocess -import sys import time import xml.etree.ElementTree @@ -21,12 +17,6 @@ from ssg.shims import input_func -# Needed for compatibility as there is no TimeoutError in python2. -if sys.version_info[0] < 3: - TimeoutException = socket.timeout -else: - TimeoutException = TimeoutError - logging.getLogger(__name__).addHandler(logging.NullHandler()) _CONTEXT_RETURN_CODES = {'pass': 0, @@ -685,7 +675,7 @@ def test_target(self): logging.info("Terminating the test run due to keyboard interrupt.") except RuntimeError as exc: logging.error("Terminating due to error: {msg}.".format(msg=str(exc))) - except TimeoutException as exc: + except TimeoutError as exc: logging.error("Terminating due to timeout: {msg}".format(msg=str(exc))) finally: self.finalize() diff --git a/tests/ssg_test_suite/profile.py b/tests/ssg_test_suite/profile.py index 23d44ea6b318..d064b39ee645 100644 --- a/tests/ssg_test_suite/profile.py +++ b/tests/ssg_test_suite/profile.py @@ -1,5 +1,4 @@ #!/usr/bin/python3 -from __future__ import print_function import logging diff --git a/tests/ssg_test_suite/rule.py b/tests/ssg_test_suite/rule.py index 87e500a332ce..5d8acbe19393 100644 --- a/tests/ssg_test_suite/rule.py +++ b/tests/ssg_test_suite/rule.py @@ -1,4 +1,3 @@ -from __future__ import print_function import collections import contextlib diff --git a/tests/ssg_test_suite/template.py b/tests/ssg_test_suite/template.py index ace1f7c63118..e3bea11de614 100644 --- a/tests/ssg_test_suite/template.py +++ b/tests/ssg_test_suite/template.py @@ -1,5 +1,4 @@ #!/usr/bin/python3 -from __future__ import print_function from ssg_test_suite import rule diff --git a/tests/ssg_test_suite/test_env.py b/tests/ssg_test_suite/test_env.py index 9a2c32ccc91f..63bd416c9e33 100644 --- a/tests/ssg_test_suite/test_env.py +++ b/tests/ssg_test_suite/test_env.py @@ -1,4 +1,3 @@ -from __future__ import print_function import contextlib import json diff --git a/tests/ssg_test_suite/virt.py b/tests/ssg_test_suite/virt.py index ff711eae9091..1c88ddb44d2c 100644 --- a/tests/ssg_test_suite/virt.py +++ b/tests/ssg_test_suite/virt.py @@ -1,20 +1,12 @@ #!/usr/bin/python3 -from __future__ import print_function import logging import socket -import sys import time import xml.etree.ElementTree as ET import libvirt -# Needed for compatibility as there is no TimeoutError in python2. -if sys.version_info[0] < 3: - TimeoutException = socket.timeout -else: - TimeoutException = TimeoutError - logging.getLogger(__name__).addHandler(logging.NullHandler()) @@ -202,7 +194,7 @@ def reboot_domain(domain, domain_ip, ssh_port): str_err = ("Timeout reached: '{0}' ({1}:{2}) domain does not " "accept connections.".format(domain.name(), domain_ip, ssh_port)) logging.debug(str_err) - raise TimeoutException(str_err) + raise TimeoutError(str_err) else: ssh_socket.close() break diff --git a/tests/stable_profile_ids.py b/tests/stable_profile_ids.py index c969f2a01419..35a3cc8923c6 100755 --- a/tests/stable_profile_ids.py +++ b/tests/stable_profile_ids.py @@ -1,6 +1,5 @@ #!/usr/bin/python3 -from __future__ import print_function import os import ssg.xml diff --git a/tests/test_product_stability.py b/tests/test_product_stability.py index 376e74a106d8..0592373a278d 100755 --- a/tests/test_product_stability.py +++ b/tests/test_product_stability.py @@ -1,6 +1,5 @@ #!/usr/bin/python3 -from __future__ import print_function import argparse import glob diff --git a/tests/test_profile_stability.py b/tests/test_profile_stability.py index 5c0194b738d1..8d89dfc8b67d 100644 --- a/tests/test_profile_stability.py +++ b/tests/test_profile_stability.py @@ -1,4 +1,3 @@ -from __future__ import print_function import argparse import fnmatch diff --git a/tests/test_suite.py b/tests/test_suite.py index 096ba53f56ad..8cf986f7bd6e 100644 --- a/tests/test_suite.py +++ b/tests/test_suite.py @@ -1,4 +1,3 @@ -from __future__ import print_function import sys import os diff --git a/tests/unit/ssg-module/test_build_yaml.py b/tests/unit/ssg-module/test_build_yaml.py index cbb7adc8d5d7..60e703a8fdf4 100644 --- a/tests/unit/ssg-module/test_build_yaml.py +++ b/tests/unit/ssg-module/test_build_yaml.py @@ -2,7 +2,6 @@ import collections import os import tempfile -import sys import yaml import pytest @@ -454,7 +453,6 @@ def rule_accounts_tmout(): return ssg.build_yaml.Rule.from_yaml(rule_file) -@pytest.mark.skipif(sys.version_info[0] < 3, reason="requires python3 or higher") def test_rule_to_xml_element(rule_accounts_tmout): xmldiff_main = pytest.importorskip("xmldiff.main") rule_el = rule_accounts_tmout.to_xml_element() @@ -487,7 +485,6 @@ def value_system_crypto_policy(): return ssg.build_yaml.Value.from_yaml(value_file) -@pytest.mark.skipif(sys.version_info[0] < 3, reason="requires python3 or higher") def test_value_to_xml_element(value_system_crypto_policy): xmldiff_main = pytest.importorskip("xmldiff.main") value_el = value_system_crypto_policy.to_xml_element() diff --git a/tests/unit/ssg-module/test_controls.py b/tests/unit/ssg-module/test_controls.py index b6e74388b8e0..62b4f2e390b9 100644 --- a/tests/unit/ssg-module/test_controls.py +++ b/tests/unit/ssg-module/test_controls.py @@ -1,6 +1,5 @@ import pytest import os -import sys import ssg.controls import ssg.build_yaml @@ -104,7 +103,6 @@ def test_controls_load(controls_manager): _load_test(controls_manager, "abcd") -@pytest.mark.skipif(sys.version_info[0] < 3, reason="requires python3 or higher") def test_controls_invalid_rules(env_yaml): existing_rules = {"accounts_tmout", "configure_crypto_policy"} controls_manager = ssg.controls.ControlsManager( @@ -115,7 +113,6 @@ def test_controls_invalid_rules(env_yaml): "Control abcd:R1 contains nonexisting rule(s) sshd_set_idle_timeout" -@pytest.mark.skipif(sys.version_info[0] < 3, reason="requires python3 or higher") def test_controls_levels(controls_manager): # Default level is the lowest level c_1 = controls_manager.get_control("abcd-levels", "S1") diff --git a/tests/unit/ssg_test_suite/test_assert_reference_unique.py b/tests/unit/ssg_test_suite/test_assert_reference_unique.py index 373589dce72c..9bcb452f4c9f 100755 --- a/tests/unit/ssg_test_suite/test_assert_reference_unique.py +++ b/tests/unit/ssg_test_suite/test_assert_reference_unique.py @@ -1,15 +1,5 @@ import os -import pytest import subprocess -import sys - -if sys.version_info < (3, 0): - try: - # pytest v4.6 has allow_module_level - pytest.skip("requires python3", allow_module_level=True) - except TypeError: - # older pytest v2.7 does not have it and it is implied - pytest.skip("requires python3") DATADIR = os.path.abspath(os.path.join(os.path.dirname(__file__), "data")) CMD = os.path.abspath( diff --git a/tests/unit/utils/test_generate_most_used_rules.py b/tests/unit/utils/test_generate_most_used_rules.py index d213fd6c0ea8..7900093bebde 100644 --- a/tests/unit/utils/test_generate_most_used_rules.py +++ b/tests/unit/utils/test_generate_most_used_rules.py @@ -1,6 +1,4 @@ import os -import sys -import pytest from argparse import Namespace from utils.profile_tool import command_most_used_rules @@ -16,7 +14,6 @@ def get_fake_args(): ) -@pytest.mark.skipif(sys.version_info[0] < 3, reason="requires python3") def test_command(capsys): command_most_used_rules(get_fake_args()) captured = capsys.readouterr() diff --git a/utils/ansible_playbook_to_role.py b/utils/ansible_playbook_to_role.py index d2da9d810fd4..e30bac625481 100755 --- a/utils/ansible_playbook_to_role.py +++ b/utils/ansible_playbook_to_role.py @@ -1,6 +1,5 @@ #!/usr/bin/python3 -from __future__ import print_function from tempfile import mkdtemp import io diff --git a/utils/build_stig_control.py b/utils/build_stig_control.py index d767fbf1ca29..7f4de481038f 100755 --- a/utils/build_stig_control.py +++ b/utils/build_stig_control.py @@ -1,6 +1,5 @@ #!/usr/bin/python3 -from __future__ import print_function import argparse import json diff --git a/utils/create-stig-overlay.py b/utils/create-stig-overlay.py index dc504e40b2c5..73055824d433 100755 --- a/utils/create-stig-overlay.py +++ b/utils/create-stig-overlay.py @@ -1,6 +1,5 @@ #!/usr/bin/python3 -from __future__ import print_function import sys import argparse diff --git a/utils/fix_rules.py b/utils/fix_rules.py index 7fc95804cef9..1708b155253b 100755 --- a/utils/fix_rules.py +++ b/utils/fix_rules.py @@ -1,6 +1,5 @@ #!/usr/bin/python3 -from __future__ import print_function import sys import os diff --git a/utils/gen_profile_table.py b/utils/gen_profile_table.py index 84d2cdd6eab2..2efce26e4624 100644 --- a/utils/gen_profile_table.py +++ b/utils/gen_profile_table.py @@ -1,6 +1,5 @@ #!/usr/bin/python3 -from __future__ import print_function import os import sys diff --git a/utils/profile_tool/most_used_components.py b/utils/profile_tool/most_used_components.py index 0f67851ec02d..dde3ae181150 100644 --- a/utils/profile_tool/most_used_components.py +++ b/utils/profile_tool/most_used_components.py @@ -1,4 +1,3 @@ -import sys import os from collections import defaultdict @@ -7,13 +6,10 @@ from .most_used_rules import _sorted_dict_by_num_value from .common import generate_output, merge_dicts, remove_zero_counts -PYTHON_2 = sys.version_info[0] < 3 - -if not PYTHON_2: - from .most_used_rules import _get_profiles_for_product - from ..controleval import ( - load_controls_manager, - load_product_yaml, +from .most_used_rules import _get_profiles_for_product +from ..controleval import ( + load_controls_manager, + load_product_yaml, ) diff --git a/utils/render-rules.py b/utils/render-rules.py index 1bb8abdcfe55..03630e8b1630 100755 --- a/utils/render-rules.py +++ b/utils/render-rules.py @@ -1,6 +1,5 @@ #!/usr/bin/python3 -from __future__ import print_function from glob import glob import os diff --git a/utils/rule_dir_json.py b/utils/rule_dir_json.py index ee7b3196f936..f7cc9833a934 100755 --- a/utils/rule_dir_json.py +++ b/utils/rule_dir_json.py @@ -1,6 +1,5 @@ #!/usr/bin/python3 -from __future__ import print_function import argparse import os