Merge pull request #14358 from Mab879/remove_py2ism

jan-cerny · web-flow · commit 9e8b949b81ff · 2026-02-10T11:22:39.000+01:00
Remove some Python 2isms
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,4 +1,3 @@
-from __future__ import print_function
 import re
 import json
 
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/tests/ssg_test_suite/profile.py b/tests/ssg_test_suite/profile.py
diff --git a/tests/ssg_test_suite/rule.py b/tests/ssg_test_suite/rule.py
diff --git a/tests/ssg_test_suite/template.py b/tests/ssg_test_suite/template.py
diff --git a/tests/ssg_test_suite/test_env.py b/tests/ssg_test_suite/test_env.py
diff --git a/tests/ssg_test_suite/virt.py b/tests/ssg_test_suite/virt.py
diff --git a/tests/stable_profile_ids.py b/tests/stable_profile_ids.py
diff --git a/tests/test_product_stability.py b/tests/test_product_stability.py
diff --git a/tests/test_profile_stability.py b/tests/test_profile_stability.py
diff --git a/tests/test_suite.py b/tests/test_suite.py
diff --git a/tests/unit/ssg-module/test_build_yaml.py b/tests/unit/ssg-module/test_build_yaml.py
diff --git a/tests/unit/ssg-module/test_controls.py b/tests/unit/ssg-module/test_controls.py
diff --git a/tests/unit/ssg_test_suite/test_assert_reference_unique.py b/tests/unit/ssg_test_suite/test_assert_reference_unique.py
diff --git a/tests/unit/utils/test_generate_most_used_rules.py b/tests/unit/utils/test_generate_most_used_rules.py
diff --git a/utils/ansible_playbook_to_role.py b/utils/ansible_playbook_to_role.py
diff --git a/utils/build_stig_control.py b/utils/build_stig_control.py
diff --git a/utils/create-stig-overlay.py b/utils/create-stig-overlay.py
diff --git a/utils/fix_rules.py b/utils/fix_rules.py
diff --git a/utils/gen_profile_table.py b/utils/gen_profile_table.py
diff --git a/utils/profile_tool/most_used_components.py b/utils/profile_tool/most_used_components.py
diff --git a/utils/render-rules.py b/utils/render-rules.py
diff --git a/utils/rule_dir_json.py b/utils/rule_dir_json.py

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`#!/usr/bin/python3`
`2`	`2`
`3`		`-from __future__ import print_function`
`4`	`3`
`5`	`4`	`import argparse`
`6`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-from __future__ import print_function`
`2`	`1`
`3`	`2`	`import argparse`
`4`	`3`	`import os.path`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-from __future__ import print_function`
`2`	`1`
`3`	`2`	`import os`
`4`	`3`	`import sys`