adds some pylint checks to ruff

12 files changed, 18 insertions, 24 deletions

diff --git a/src/sec_certs/dataset/cc.py b/src/sec_certs/dataset/cc.py
index 484397e2..bb8ccc4d 100644
--- a/src/sec_certs/dataset/cc.py
+++ b/src/sec_certs/dataset/cc.py
@@ -31,7 +31,7 @@ from sec_certs.sample.cc_certificate_id import CertificateId
 from sec_certs.sample.cc_maintenance_update import CCMaintenanceUpdate
 from sec_certs.sample.protection_profile import ProtectionProfile
 from sec_certs.serialization.json import ComplexSerializableType, CustomJSONDecoder, serialize
-from sec_certs.utils import helpers as helpers
+from sec_certs.utils import helpers
 from sec_certs.utils import parallel_processing as cert_processing
 from sec_certs.utils.sanitization import sanitize_navigable_string as sns
 
diff --git a/src/sec_certs/dataset/cve.py b/src/sec_certs/dataset/cve.py
index 77ea0152..4863ffd2 100644
--- a/src/sec_certs/dataset/cve.py
+++ b/src/sec_certs/dataset/cve.py
@@ -14,12 +14,12 @@ from typing import ClassVar
 import numpy as np
 import pandas as pd
 
-import sec_certs.constants as constants
-import sec_certs.utils.helpers as helpers
+from sec_certs import constants
 from sec_certs.dataset.json_path_dataset import JSONPathDataset
 from sec_certs.sample.cpe import CPE, cached_cpe
 from sec_certs.sample.cve import CVE
 from sec_certs.serialization.json import ComplexSerializableType
+from sec_certs.utils import helpers
 from sec_certs.utils.parallel_processing import process_parallel
 from sec_certs.utils.tqdm import tqdm
 
diff --git a/src/sec_certs/dataset/dataset.py b/src/sec_certs/dataset/dataset.py
index 40ea5611..3d106486 100644
--- a/src/sec_certs/dataset/dataset.py
+++ b/src/sec_certs/dataset/dataset.py
@@ -14,8 +14,7 @@ from typing import Any, Generic, Iterator, TypeVar, cast
 
 import pandas as pd
 
-import sec_certs.constants as constants
-import sec_certs.utils.helpers as helpers
+from sec_certs import constants
 from sec_certs.config.configuration import config
 from sec_certs.dataset.cpe import CPEDataset
 from sec_certs.dataset.cve import CVEDataset
@@ -23,6 +22,7 @@ from sec_certs.model.cpe_matching import CPEClassifier
 from sec_certs.sample.certificate import Certificate
 from sec_certs.sample.cpe import CPE
 from sec_certs.serialization.json import ComplexSerializableType, get_class_fullname, serialize
+from sec_certs.utils import helpers
 from sec_certs.utils.tqdm import tqdm
 
 logger = logging.getLogger(__name__)
diff --git a/src/sec_certs/dataset/protection_profile.py b/src/sec_certs/dataset/protection_profile.py
index edfb6850..3edd445d 100644
--- a/src/sec_certs/dataset/protection_profile.py
+++ b/src/sec_certs/dataset/protection_profile.py
@@ -7,11 +7,11 @@ import tempfile
 from dataclasses import dataclass
 from pathlib import Path
 
-import sec_certs.utils.helpers as helpers
 from sec_certs import constants
 from sec_certs.config.configuration import config
 from sec_certs.sample.protection_profile import ProtectionProfile
 from sec_certs.serialization.json import get_class_fullname
+from sec_certs.utils import helpers
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/sec_certs/model/evaluation.py b/src/sec_certs/model/evaluation.py
index 4d0243f6..6f14fda5 100644
--- a/src/sec_certs/model/evaluation.py
+++ b/src/sec_certs/model/evaluation.py
@@ -6,11 +6,11 @@ from pathlib import Path
 
 import numpy as np
 
-import sec_certs.utils.helpers as helpers
 from sec_certs.dataset.cpe import CPEDataset
 from sec_certs.sample.cc import CCCertificate
 from sec_certs.sample.fips import FIPSCertificate
 from sec_certs.serialization.json import CustomJSONEncoder
+from sec_certs.utils import helpers
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/sec_certs/sample/cc.py b/src/sec_certs/sample/cc.py
index 8816101b..b7e97408 100644
--- a/src/sec_certs/sample/cc.py
+++ b/src/sec_certs/sample/cc.py
@@ -17,7 +17,7 @@ from bs4 import Tag
 import sec_certs.utils.extract
 import sec_certs.utils.pdf
 import sec_certs.utils.sanitization
-from sec_certs import constants as constants
+from sec_certs import constants
 from sec_certs.cert_rules import SARS_IMPLIED_FROM_EAL, cc_rules, rules, security_level_csv_scan
 from sec_certs.sample.cc_certificate_id import canonicalize
 from sec_certs.sample.certificate import Certificate, References, logger
diff --git a/src/sec_certs/sample/cc_maintenance_update.py b/src/sec_certs/sample/cc_maintenance_update.py
index d78359fc..4273b25e 100644
--- a/src/sec_certs/sample/cc_maintenance_update.py
+++ b/src/sec_certs/sample/cc_maintenance_update.py
@@ -4,9 +4,9 @@ import logging
 from datetime import date
 from typing import ClassVar
 
-import sec_certs.utils.helpers as helpers
 from sec_certs.sample.cc import CCCertificate
 from sec_certs.serialization.json import ComplexSerializableType
+from sec_certs.utils import helpers
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/sec_certs/sample/fips.py b/src/sec_certs/sample/fips.py
index 3b78e075..9988d629 100644
--- a/src/sec_certs/sample/fips.py
+++ b/src/sec_certs/sample/fips.py
@@ -14,12 +14,7 @@ import requests
 from bs4 import BeautifulSoup, Tag
 from tabula import read_pdf
 
-import sec_certs.constants as constants
-import sec_certs.utils.extract
-import sec_certs.utils.helpers as helpers
-import sec_certs.utils.pdf
-import sec_certs.utils.pdf as pdf
-import sec_certs.utils.tables as tables
+from sec_certs import constants
 from sec_certs.cert_rules import FIPS_ALGS_IN_TABLE, fips_rules
 from sec_certs.config.configuration import config
 from sec_certs.sample.certificate import Certificate, References, logger
@@ -28,6 +23,7 @@ from sec_certs.sample.certificate import PdfData as BasePdfData
 from sec_certs.sample.cpe import CPE
 from sec_certs.serialization.json import ComplexSerializableType
 from sec_certs.serialization.pandas import PandasSerializableType
+from sec_certs.utils import extract, helpers, pdf, tables
 from sec_certs.utils.helpers import fips_dgst
 
 
@@ -542,9 +538,7 @@ class FIPSCertificate(
         """
         Converts policy pdf -> txt
         """
-        ocr_done, ok_result = sec_certs.utils.pdf.convert_pdf_file(
-            cert.state.policy_pdf_path, cert.state.policy_txt_path
-        )
+        ocr_done, ok_result = pdf.convert_pdf_file(cert.state.policy_pdf_path, cert.state.policy_txt_path)
 
         # If OCR was done and the result was garbage
         cert.state.policy_convert_garbage = ocr_done
@@ -564,7 +558,7 @@ class FIPSCertificate(
         """
         Extract the PDF metadata from the security policy.
         """
-        _, metadata = sec_certs.utils.pdf.extract_pdf_metadata(cert.state.policy_pdf_path)
+        _, metadata = pdf.extract_pdf_metadata(cert.state.policy_pdf_path)
 
         if metadata:
             cert.pdf_data.policy_metadata = metadata
@@ -578,7 +572,7 @@ class FIPSCertificate(
         """
         Extract keywords from policy document
         """
-        keywords = sec_certs.utils.extract.extract_keywords(cert.state.policy_txt_path, fips_rules)
+        keywords = extract.extract_keywords(cert.state.policy_txt_path, fips_rules)
         if not keywords:
             cert.state.policy_extract_ok = False
         else:
diff --git a/src/sec_certs/sample/protection_profile.py b/src/sec_certs/sample/protection_profile.py
index b7c2ec34..4c26a1c7 100644
--- a/src/sec_certs/sample/protection_profile.py
+++ b/src/sec_certs/sample/protection_profile.py
@@ -5,8 +5,8 @@ import logging
 from dataclasses import dataclass
 from typing import Any
 
-import sec_certs.utils.sanitization as sanitization
 from sec_certs.serialization.json import ComplexSerializableType
+from sec_certs.utils import sanitization
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/sec_certs/utils/extract.py b/src/sec_certs/utils/extract.py
index 09460fb7..37d79f73 100644
--- a/src/sec_certs/utils/extract.py
+++ b/src/sec_certs/utils/extract.py
@@ -10,7 +10,7 @@ from typing import Any, Iterator
 
 import numpy as np
 
-from sec_certs import constants as constants
+from sec_certs import constants
 from sec_certs.cert_rules import REGEXEC_SEP, cc_rules
 from sec_certs.constants import FILE_ERRORS_STRATEGY, LINE_SEPARATOR, MAX_ALLOWED_MATCH_LENGTH
 
diff --git a/src/sec_certs/utils/helpers.py b/src/sec_certs/utils/helpers.py
index e22feacf..969dc8e1 100644
--- a/src/sec_certs/utils/helpers.py
+++ b/src/sec_certs/utils/helpers.py
@@ -14,7 +14,7 @@ import numpy as np
 import pkgconfig
 import requests
 
-import sec_certs.constants as constants
+from sec_certs import constants
 from sec_certs.utils import parallel_processing
 from sec_certs.utils.tqdm import tqdm
 
diff --git a/src/sec_certs/utils/pdf.py b/src/sec_certs/utils/pdf.py
index e22076a1..ea2487b0 100644
--- a/src/sec_certs/utils/pdf.py
+++ b/src/sec_certs/utils/pdf.py
@@ -14,7 +14,7 @@ import pikepdf
 from pypdf import PdfReader
 from pypdf.generic import BooleanObject, ByteStringObject, FloatObject, IndirectObject, NumberObject, TextStringObject
 
-from sec_certs import constants as constants
+from sec_certs import constants
 from sec_certs.constants import (
     GARBAGE_ALPHA_CHARS_THRESHOLD,
     GARBAGE_AVG_LLEN_THRESHOLD,