aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authoradamjanovsky2024-02-20 12:33:00 +0100
committerGitHub2024-02-20 12:33:00 +0100
commit9f02cf2ef3e499bc4ded221cd918be1461e73708 (patch)
tree292ca04c241716e29af618c4066c850daf70cfde /src
parent7ee9d2f6df61f60bb436a11a049990da6dd38d20 (diff)
parentbb23ee631766067e9a8f143a8801088a39902b5c (diff)
downloadsec-certs-9f02cf2ef3e499bc4ded221cd918be1461e73708.tar.gz
sec-certs-9f02cf2ef3e499bc4ded221cd918be1461e73708.tar.zst
sec-certs-9f02cf2ef3e499bc4ded221cd918be1461e73708.zip
Merge pull request #394 from crocs-muni/document-reference-context-inference
document reference context inference
Diffstat (limited to 'src')
-rw-r--r--src/sec_certs/sample/cpe.py6
-rw-r--r--src/sec_certs/sample/fips.py2
-rw-r--r--src/sec_certs/utils/extract.py4
3 files changed, 5 insertions, 7 deletions
diff --git a/src/sec_certs/sample/cpe.py b/src/sec_certs/sample/cpe.py
index 5e9e8b65..e8ec29eb 100644
--- a/src/sec_certs/sample/cpe.py
+++ b/src/sec_certs/sample/cpe.py
@@ -32,16 +32,16 @@ class CPEMatchCriteria(ComplexSerializableType):
@classmethod
def from_nist_dict(cls, dct: dict[str, Any]) -> CPEMatchCriteria:
- if dct.get("versionStartIncluding", None):
+ if dct.get("versionStartIncluding"):
version_start = ("including", dct["versionStartIncluding"])
elif dct.get("versionStartExcluding"):
version_start = ("excluding", dct["versionStartExcluding"])
else:
version_start = None
- if dct.get("versionEndIncluding", None):
+ if dct.get("versionEndIncluding"):
version_end = ("including", dct["versionEndIncluding"])
- elif dct.get("versionEndExcluding", None):
+ elif dct.get("versionEndExcluding"):
version_end = ("excluding", dct["versionEndExcluding"])
else:
version_end = None
diff --git a/src/sec_certs/sample/fips.py b/src/sec_certs/sample/fips.py
index 8e9268cf..26b9833e 100644
--- a/src/sec_certs/sample/fips.py
+++ b/src/sec_certs/sample/fips.py
@@ -53,7 +53,7 @@ class FIPSHTMLParser:
def _build_details_dict(self, details_div: Tag) -> dict[str, Any]:
def parse_single_detail_entry(key, entry):
normalized_key = DETAILS_KEY_NORMALIZATION_DICT[key]
- normalization_func = DETAILS_KEY_TO_NORMALIZATION_FUNCTION.get(normalized_key, None)
+ normalization_func = DETAILS_KEY_TO_NORMALIZATION_FUNCTION.get(normalized_key)
normalized_entry = (
FIPSHTMLParser.normalize_string(entry.text) if not normalization_func else normalization_func(entry)
)
diff --git a/src/sec_certs/utils/extract.py b/src/sec_certs/utils/extract.py
index 669cbcfc..340ad568 100644
--- a/src/sec_certs/utils/extract.py
+++ b/src/sec_certs/utils/extract.py
@@ -727,8 +727,7 @@ def load_text_file(
whole_text = ""
whole_text_with_newlines = ""
- lines_included = 0
- for line in lines:
+ for lines_included, line in enumerate(lines):
if limit_max_lines != -1 and lines_included >= limit_max_lines:
break
@@ -736,7 +735,6 @@ def load_text_file(
line = line.replace("\n", "")
whole_text += line
whole_text += line_separator
- lines_included += 1
return whole_text, whole_text_with_newlines, was_unicode_decode_error