rules as constants

3 files changed, 9 insertions, 8 deletions

diff --git a/sec_certs/certificate.py b/sec_certs/certificate.py
index 1e8c85e1..22cbe212 100644
--- a/sec_certs/certificate.py
+++ b/sec_certs/certificate.py
@@ -20,7 +20,7 @@ from sec_certs.serialization import ComplexSerializableType, CustomJSONDecoder,
 import sec_certs.constants as constants
 from sec_certs.extract_certificates import load_cert_file, normalize_match_string, save_modified_cert_file, REGEXEC_SEP, \
     LINE_SEPARATOR, APPEND_DETAILED_MATCH_MATCHES
-from sec_certs.cert_rules import fips_rules, configuration, fips_common_rules
+from sec_certs.cert_rules import fips_rules, fips_common_rules
 
 logger = logging.getLogger(__name__)
 
@@ -493,7 +493,7 @@ class FIPSCertificate(Certificate, ComplexSerializableType):
         text, text_with_newlines, unicode_error = load_cert_file(cert.state.sp_path.with_suffix('.pdf.txt'),
                                                                  -1, LINE_SEPARATOR)
 
-        text_to_parse = text_with_newlines if configuration["use_text_with_newlines_during_parsing"] else text
+        text_to_parse = text_with_newlines if constants.FIPS_USE_NEWLINES else text
 
         items_found, fips_text = FIPSCertificate.parse_cert_file(text_to_parse, cert.algorithms)
 
@@ -684,10 +684,11 @@ class FIPSCertificate(Certificate, ComplexSerializableType):
 
     @staticmethod
     def get_compare(vendor: str):
-        vendor_split = vendor.replace(',', '')\
+        vendor_split = vendor.replace(',', '') \
             .replace('-', ' ').replace('+', ' ').replace('®', '').split()
         return vendor_split[0] if len(vendor_split) > 0 else vendor
 
+
 class CommonCriteriaCert(Certificate, ComplexSerializableType):
     cc_url = 'http://www.commoncriteriaportal.org'
     empty_st_url = 'http://www.commoncriteriaportal.org/files/epfiles/'
diff --git a/sec_certs/constants.py b/sec_certs/constants.py
index f22bd55d..d7b70f46 100644
--- a/sec_certs/constants.py
+++ b/sec_certs/constants.py
@@ -44,4 +44,5 @@ TAG_PP_REVIEWER = 'pp_reviewer'
 TAG_KEYWORDS = 'keywords'
 FIPS_NOT_AVAILABLE_CERT_SIZE = 10000
 FIPS_SMALLEST_CERT_ID_TO_CONNECT = configuration['smallest_certificate_id_to_connect']['value']
-FIPS_YEAR_DIFFERENCE_BETWEEN_VALIDATION = configuration["year_difference_between_validations"]["value"]
\ No newline at end of file
+FIPS_YEAR_DIFFERENCE_BETWEEN_VALIDATION = configuration["year_difference_between_validations"]["value"]
+FIPS_USE_NEWLINES = configuration["use_text_with_newlines_during_parsing"]['value']
\ No newline at end of file
diff --git a/sec_certs/dataset.py b/sec_certs/dataset.py
index a8396fc6..46674f60 100644
--- a/sec_certs/dataset.py
+++ b/sec_certs/dataset.py
@@ -22,7 +22,6 @@ import sec_certs.files as files
 
 from sec_certs.certificate import CommonCriteriaCert, Certificate, FIPSCertificate
 from sec_certs.serialization import ComplexSerializableType, CustomJSONDecoder, CustomJSONEncoder
-from sec_certs.cert_rules import configuration
 
 logger = logging.getLogger(__name__)
 
@@ -701,12 +700,12 @@ class FIPSDataset(Dataset, ComplexSerializableType):
                 conn_first = self.certs[other_id].date_validation[0].year
                 conn_last = self.certs[other_id].date_validation[-1].year
 
-                return cert_first - conn_first > configuration["year_difference_between_validations"]["value"] \
-                       and cert_last - conn_last > configuration["year_difference_between_validations"]["value"]
+                return cert_first - conn_first > constants.FIPS_YEAR_DIFFERENCE_BETWEEN_VALIDATION \
+                       and cert_last - conn_last > constants.FIPS_YEAR_DIFFERENCE_BETWEEN_VALIDATION
 
             # "< 105" still needs to be used, because of some old certs being revalidated
             if cert_candidate.isdecimal() \
-                    and int(cert_candidate) < configuration["smallest_certificate_id_to_connect"]["value"] or \
+                    and int(cert_candidate) < constants.FIPS_SMALLEST_CERT_ID_TO_CONNECT or \
                     compare_certs(processed_cert, cert_candidate):
                 return False
             if cert_candidate not in self.algorithms.certs: