From b090055c9162e631a7c4278b6d6574456f8e8774 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Luka=C5=A1=C3=ADk?= Date: Wed, 4 Oct 2023 17:27:03 +0200 Subject: [PATCH] remove some unnecessary imports --- build-scripts/build_templated_content.py | 1 - build-scripts/compile_all.py | 1 - build-scripts/generate_man_page.py | 1 - build-scripts/profile_tool.py | 1 - shared/templates/accounts_password/template.py | 2 -- .../templates/audit_rules_file_deletion_events/template.py | 3 --- .../audit_rules_unsuccessful_file_modification/template.py | 3 --- shared/templates/compliance_operator_not_found/template.py | 3 --- ssg/ansible.py | 1 - ssg/build_ovals.py | 3 +-- ssg/build_sce.py | 1 - ssg/build_yaml.py | 1 - ssg/fixes.py | 1 - ssg/rules.py | 1 - ssg/utils.py | 2 +- ssg/xml.py | 1 - utils/autoprodtyper.py | 1 - utils/controlrefcheck.py | 1 - utils/create_scap_delta_tailoring.py | 1 - utils/fix_rules.py | 1 - utils/gen_multiple_reference_tables.py | 4 ---- utils/gen_profile_table.py | 2 -- utils/gen_srg_table.py | 1 - utils/render-policy.py | 4 ---- utils/render-rule.py | 1 - utils/render-rules.py | 5 ----- utils/srg_export/html.py | 1 - utils/srg_export/md.py | 4 ---- utils/srg_export/xlsx.py | 3 --- utils/tables/table_renderer.py | 3 --- utils/template_renderer.py | 2 -- 31 files changed, 2 insertions(+), 58 deletions(-) diff --git a/build-scripts/build_templated_content.py b/build-scripts/build_templated_content.py index acbf5549b01..e9f095e0202 100644 --- a/build-scripts/build_templated_content.py +++ b/build-scripts/build_templated_content.py @@ -2,7 +2,6 @@ from __future__ import print_function -import os import argparse import ssg.environment diff --git a/build-scripts/compile_all.py b/build-scripts/compile_all.py index 246a1841457..90d4b4d774d 100644 --- a/build-scripts/compile_all.py +++ b/build-scripts/compile_all.py @@ -2,7 +2,6 @@ import argparse import os.path -from glob import glob import ssg.build_profile import ssg.build_yaml diff --git a/build-scripts/generate_man_page.py b/build-scripts/generate_man_page.py index eb7f74b1314..e144a9f5a5b 100755 --- a/build-scripts/generate_man_page.py +++ b/build-scripts/generate_man_page.py @@ -3,7 +3,6 @@ from __future__ import print_function import argparse -import sys import ssg.build_profile import ssg.constants # ssg.xml provides ElementTree which is a wrapper for standard ElementTree diff --git a/build-scripts/profile_tool.py b/build-scripts/profile_tool.py index 3fb3aaceeb8..b6c61cc08c9 100755 --- a/build-scripts/profile_tool.py +++ b/build-scripts/profile_tool.py @@ -7,7 +7,6 @@ import jinja2 import os import os.path -import sys try: import ssg.build_profile diff --git a/shared/templates/accounts_password/template.py b/shared/templates/accounts_password/template.py index 527dd247ef4..c6b4d5da331 100644 --- a/shared/templates/accounts_password/template.py +++ b/shared/templates/accounts_password/template.py @@ -1,5 +1,3 @@ -from ssg.utils import parse_template_boolean_value - def preprocess(data, lang): data["zero_comparison_operation"] = data.get("zero_comparison_operation", None) diff --git a/shared/templates/audit_rules_file_deletion_events/template.py b/shared/templates/audit_rules_file_deletion_events/template.py index 4916d892521..5706bcd9713 100644 --- a/shared/templates/audit_rules_file_deletion_events/template.py +++ b/shared/templates/audit_rules_file_deletion_events/template.py @@ -1,6 +1,3 @@ -import ssg.utils - - def _audit_rules_file_deletion_events(data, lang): if lang == "bash": if "syscall_grouping" in data: diff --git a/shared/templates/audit_rules_unsuccessful_file_modification/template.py b/shared/templates/audit_rules_unsuccessful_file_modification/template.py index dd9714457a2..5c83379d7cb 100644 --- a/shared/templates/audit_rules_unsuccessful_file_modification/template.py +++ b/shared/templates/audit_rules_unsuccessful_file_modification/template.py @@ -1,6 +1,3 @@ -import ssg.utils - - def _audit_rules_unsuccessful_file_modification(data, lang): if lang == "bash": if "syscall_grouping" in data: diff --git a/shared/templates/compliance_operator_not_found/template.py b/shared/templates/compliance_operator_not_found/template.py index cecaf59c51b..69587033d67 100644 --- a/shared/templates/compliance_operator_not_found/template.py +++ b/shared/templates/compliance_operator_not_found/template.py @@ -1,6 +1,3 @@ -from ssg.utils import parse_template_boolean_value - - def preprocess(data, lang): return data diff --git a/ssg/ansible.py b/ssg/ansible.py index 82a013da30f..e937a07427f 100644 --- a/ssg/ansible.py +++ b/ssg/ansible.py @@ -9,7 +9,6 @@ from .constants import ansible_version_requirement_pre_task_name from .constants import min_ansible_version -from .constants import REF_PREFIX_MAP def add_minimum_version(ansible_src): diff --git a/ssg/build_ovals.py b/ssg/build_ovals.py index b291c01dff8..836c669fed7 100644 --- a/ssg/build_ovals.py +++ b/ssg/build_ovals.py @@ -4,7 +4,6 @@ import os import os.path import sys -import re from copy import deepcopy import collections @@ -16,7 +15,7 @@ from .id_translate import IDTranslator from .jinja import process_file_with_macros from .rule_yaml import parse_prodtype -from .rules import get_rule_dir_id, get_rule_dir_ovals, find_rule_dirs_in_paths +from .rules import get_rule_dir_ovals, find_rule_dirs_in_paths from . import utils, products from .utils import mkdir_p from .xml import ElementTree, oval_generated_header diff --git a/ssg/build_sce.py b/ssg/build_sce.py index dc238b35413..80f3c7ed096 100644 --- a/ssg/build_sce.py +++ b/ssg/build_sce.py @@ -4,7 +4,6 @@ import os import os.path import json -import sys from .build_yaml import Rule, DocumentationNotComplete from .constants import ( diff --git a/ssg/build_yaml.py b/ssg/build_yaml.py index cf8d5ab0ec5..30f9911e07c 100644 --- a/ssg/build_yaml.py +++ b/ssg/build_yaml.py @@ -2,7 +2,6 @@ from __future__ import print_function from copy import deepcopy -import collections import datetime import json import os diff --git a/ssg/fixes.py b/ssg/fixes.py index d9cbd9c337f..d8834f979a8 100644 --- a/ssg/fixes.py +++ b/ssg/fixes.py @@ -2,7 +2,6 @@ from __future__ import print_function import os -import re from .build_remediations import parse_from_file_without_jinja from .rule_yaml import parse_prodtype diff --git a/ssg/rules.py b/ssg/rules.py index 055e576ad37..b4d30113c10 100644 --- a/ssg/rules.py +++ b/ssg/rules.py @@ -2,7 +2,6 @@ from __future__ import print_function import os -from glob import glob def get_rule_dir_yaml(dir_path): diff --git a/ssg/utils.py b/ssg/utils.py index 925ce6a424a..7cfe1648fa6 100644 --- a/ssg/utils.py +++ b/ssg/utils.py @@ -11,7 +11,7 @@ from .constants import (FULL_NAME_TO_PRODUCT_MAPPING, MAKEFILE_ID_TO_PRODUCT_MAP, MULTI_PLATFORM_LIST, - MULTI_PLATFORM_MAPPING) + ) class SSGError(RuntimeError): diff --git a/ssg/xml.py b/ssg/xml.py index 0185431c676..b1bdee22922 100644 --- a/ssg/xml.py +++ b/ssg/xml.py @@ -4,7 +4,6 @@ import platform import re -import xml.etree.ElementTree as ET from .constants import ( xml_version, oval_header, timestamp, PREFIX_TO_NS, XCCDF11_NS, XCCDF12_NS) diff --git a/utils/autoprodtyper.py b/utils/autoprodtyper.py index 4603413522d..198a550b96b 100755 --- a/utils/autoprodtyper.py +++ b/utils/autoprodtyper.py @@ -1,6 +1,5 @@ #!/usr/bin/python3 -import sys import os import argparse import json diff --git a/utils/controlrefcheck.py b/utils/controlrefcheck.py index f955b022300..d6308817ab8 100755 --- a/utils/controlrefcheck.py +++ b/utils/controlrefcheck.py @@ -7,7 +7,6 @@ import sys try: - from ssg.build_cpe import ProductCPEs import ssg.build_profile import ssg.controls import ssg.environment diff --git a/utils/create_scap_delta_tailoring.py b/utils/create_scap_delta_tailoring.py index a42dcf33b57..3ef1c62e20e 100755 --- a/utils/create_scap_delta_tailoring.py +++ b/utils/create_scap_delta_tailoring.py @@ -12,7 +12,6 @@ import ssg.constants import ssg.rules import ssg.yaml -import ssg.build_yaml import ssg.environment SSG_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), "..")) diff --git a/utils/fix_rules.py b/utils/fix_rules.py index c0fa0604dbd..f6cf095c3d8 100755 --- a/utils/fix_rules.py +++ b/utils/fix_rules.py @@ -8,7 +8,6 @@ import argparse import json import re -import random from ssg import yaml, cce, products from ssg.shims import input_func diff --git a/utils/gen_multiple_reference_tables.py b/utils/gen_multiple_reference_tables.py index 75c127aacca..4341a1c84a7 100644 --- a/utils/gen_multiple_reference_tables.py +++ b/utils/gen_multiple_reference_tables.py @@ -1,11 +1,7 @@ #!/usr/bin/python3 -import os -import re -import glob import argparse -import ssg.build_yaml import ssg.constants from utils import gen_reference_table diff --git a/utils/gen_profile_table.py b/utils/gen_profile_table.py index e66eac3cfae..34583836e59 100644 --- a/utils/gen_profile_table.py +++ b/utils/gen_profile_table.py @@ -5,8 +5,6 @@ import os import sys -import argparse - import ssg.build_yaml import tables.table_renderer diff --git a/utils/gen_srg_table.py b/utils/gen_srg_table.py index 891c0b3bb53..84b7a308f63 100644 --- a/utils/gen_srg_table.py +++ b/utils/gen_srg_table.py @@ -3,7 +3,6 @@ import argparse import collections import os -import xml.etree.ElementTree as ET import ssg.build_stig import ssg.build_yaml diff --git a/utils/render-policy.py b/utils/render-policy.py index d70c524268a..c30f39d17f5 100755 --- a/utils/render-policy.py +++ b/utils/render-policy.py @@ -1,11 +1,7 @@ #!/usr/bin/python3 from glob import glob -import collections import os -import pathlib - -import argparse import ssg.build_yaml import ssg.controls diff --git a/utils/render-rule.py b/utils/render-rule.py index 9d84503bec2..5bd59d9a638 100755 --- a/utils/render-rule.py +++ b/utils/render-rule.py @@ -1,6 +1,5 @@ #!/usr/bin/python3 -from glob import glob import collections import sys import pathlib diff --git a/utils/render-rules.py b/utils/render-rules.py index f1d578437ea..1bb8abdcfe5 100755 --- a/utils/render-rules.py +++ b/utils/render-rules.py @@ -3,12 +3,7 @@ from __future__ import print_function from glob import glob -import collections import os -import re -import pathlib - -import argparse import ssg.build_yaml import ssg.controls diff --git a/utils/srg_export/html.py b/utils/srg_export/html.py index 7a849a591cc..b6421bf360c 100755 --- a/utils/srg_export/html.py +++ b/utils/srg_export/html.py @@ -2,7 +2,6 @@ import pathlib import pandas as pd -import create_srg_export import utils.srg_export.data diff --git a/utils/srg_export/md.py b/utils/srg_export/md.py index daf3e8c7bba..2fd03811717 100644 --- a/utils/srg_export/md.py +++ b/utils/srg_export/md.py @@ -1,7 +1,3 @@ -import re - -import create_srg_export - import utils.srg_export.data diff --git a/utils/srg_export/xlsx.py b/utils/srg_export/xlsx.py index f72df48f0e2..058b5c3dc0b 100755 --- a/utils/srg_export/xlsx.py +++ b/utils/srg_export/xlsx.py @@ -1,11 +1,8 @@ #!/usr/bin/env python3 -import datetime -import os import openpyxl from openpyxl.styles import Alignment, Font, PatternFill from openpyxl.styles.colors import Color -import create_srg_export import utils.srg_export.data diff --git a/utils/tables/table_renderer.py b/utils/tables/table_renderer.py index 0b15cabd646..33abad12ec5 100644 --- a/utils/tables/table_renderer.py +++ b/utils/tables/table_renderer.py @@ -1,10 +1,7 @@ import collections import os -import sys import re -import argparse - import ssg.build_yaml import ssg.constants diff --git a/utils/template_renderer.py b/utils/template_renderer.py index 79296689063..839f8950170 100644 --- a/utils/template_renderer.py +++ b/utils/template_renderer.py @@ -1,7 +1,5 @@ #!/usr/bin/python3 -from glob import glob -import collections import os import argparse