chore: black 25.1.0 & mypy linter fixes (#5264)

* chore: blacken files for black 25.1.0

* chore: fix mypy linter error: Wrong type for epss_source.

* remove extraneous test file

---------

Signed-off-by: Terri Oda <[email protected]>

Author: terriko

cve_bin_tool/async_utils.py

@@ -24,7 +24,7 @@
 # SOFTWARE."
 
 
-""" Utility classes for the CVE Binary Tool """
+"""Utility classes for the CVE Binary Tool"""
 
 from __future__ import annotations
 

cve_bin_tool/checkers/__init__.py

@@ -1,7 +1,7 @@
 # Copyright (C) 2021 Intel Corporation
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-""" CVE Checkers """
+"""CVE Checkers"""
 from __future__ import annotations
 
 import collections

cve_bin_tool/data_sources/epss_source.py

@@ -13,14 +13,15 @@
 
 import aiohttp
 
+from cve_bin_tool.data_sources import Data_Source
 from cve_bin_tool.database_defaults import DISK_LOCATION_BACKUP, DISK_LOCATION_DEFAULT
 from cve_bin_tool.error_handler import ErrorMode
 from cve_bin_tool.version import HTTP_HEADERS
 
 logging.basicConfig(level=logging.DEBUG)
 
 
-class Epss_Source:
+class Epss_Source(Data_Source):
     """Data source for downloading and storing epss data"""
 
     SOURCE = "EPSS"

cve_bin_tool/file.py

@@ -62,24 +62,24 @@ def check_fake_test(_filename: str, signature: bytes) -> bool:
 
 def check_mach_o_32(_filename: str, signature: bytes) -> bool:
     """Check for Mach-O 32-bit signature."""
-    return signature[:4] == b"\xFE\xED\xFA\xCE"
+    return signature[:4] == b"\xfe\xed\xfa\xce"
 
 
 def check_mach_o_64(_filename: str, signature: bytes) -> bool:
     """Check for Mach-O 64-bit signature."""
-    return signature[:4] == b"\xFE\xED\xFA\xCF"
+    return signature[:4] == b"\xfe\xed\xfa\xcf"
 
 
 def check_mach_o_universal(_filename: str, signature: bytes) -> bool:
     """Check for Mach-O Universal Binary signature."""
-    return signature[:4] == b"\xCA\xFE\xBA\xBE"
+    return signature[:4] == b"\xca\xfe\xba\xbe"
 
 
 def check_ios_arm(_filename: str, signature: bytes) -> bool:
     """Check for Mach-O Universal Binary signature."""
-    return signature[:4] == b"\xCF\xFA\xED\xFE"
+    return signature[:4] == b"\xcf\xfa\xed\xfe"
 
 
 def check_wasm(_filename: str, signature: bytes) -> bool:
     """Check for WebAssembly (WASM) signature."""
-    return signature[:4] == b"\x00\x61\x73\x6D"
+    return signature[:4] == b"\x00\x61\x73\x6d"

cve_bin_tool/merge.py

@@ -228,7 +228,7 @@ def get_intermediate_cve_scanner(cve_data_list, score) -> list[CVEScanner]:
 
 
 def parse_data_from_json(
-    json_data: list[dict[str, str]]
+    json_data: list[dict[str, str]],
 ) -> dict[ProductInfo, TriageData]:
     """Parse CVE JSON dictionary to Dict[ProductInfo, TriageData]"""
 

temp_test_json2.json

@@ -35,11 +35,11 @@ def _check_test(self, type):
         the given string is in the parsed result"""
         file_signatures = {
             "elf": (b"\x7f\x45\x4c\x46\x02\x01\x01\x03\n", True, ".out"),
-            "mach_o_32": (b"\xFE\xED\xFA\xCE\x00\x00\x00\x00", True, ".out"),
-            "mach_o_64": (b"\xFE\xED\xFA\xCF\x00\x00\x00\x00", True, ".out"),
-            "mach_o_universal": (b"\xCA\xFE\xBA\xBE\x00\x00\x00\x00", True, ".out"),
-            "ios_arm": (b"\xCF\xFA\xED\xFE\x00\x00\x00\x00", True, ".out"),
-            "wasm": (b"yoyo\x00\x61\x73\x6D\x01\x00\x00\x00", True, ".out"),
+            "mach_o_32": (b"\xfe\xed\xfa\xce\x00\x00\x00\x00", True, ".out"),
+            "mach_o_64": (b"\xfe\xed\xfa\xcf\x00\x00\x00\x00", True, ".out"),
+            "mach_o_universal": (b"\xca\xfe\xba\xbe\x00\x00\x00\x00", True, ".out"),
+            "ios_arm": (b"\xcf\xfa\xed\xfe\x00\x00\x00\x00", True, ".out"),
+            "wasm": (b"yoyo\x00\x61\x73\x6d\x01\x00\x00\x00", True, ".out"),
             "c": (b"#include <stdio.h>", False, ".c"),
             "single_byte": (b"1", False, ".txt"),
             "windows": (b"MZ\x90\x00", True, ".dll"),

test/test_executable.py

@@ -1,7 +1,7 @@
 # Copyright (C) 2022 Intel Corporation
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-""" CVE Binary Tool tests for the extractor function """
+"""CVE Binary Tool tests for the extractor function"""
 from __future__ import annotations
 
 import shutil

test/test_extractor.py

@@ -32,11 +32,11 @@ async def _check_test(self, type):
         the given string is in the parsed result"""
         file_signatures = {
             "elf": (b"\x7f\x45\x4c\x46\x02\x01\x01\x03\n", True, ".out"),
-            "mach_o_32": (b"\xFE\xED\xFA\xCE\x00\x00\x00\x00", True, ".out"),
-            "mach_o_64": (b"\xFE\xED\xFA\xCF\x00\x00\x00\x00", True, ".out"),
-            "mach_o_universal": (b"\xCA\xFE\xBA\xBE\x00\x00\x00\x00", True, ".out"),
-            "ios_arm": (b"\xCF\xFA\xED\xFE\x00\x00\x00\x00", True, ".out"),
-            "wasm": (b"\x00\x61\x73\x6D\x01\x00\x00\x00", True, ".out"),
+            "mach_o_32": (b"\xfe\xed\xfa\xce\x00\x00\x00\x00", True, ".out"),
+            "mach_o_64": (b"\xfe\xed\xfa\xcf\x00\x00\x00\x00", True, ".out"),
+            "mach_o_universal": (b"\xca\xfe\xba\xbe\x00\x00\x00\x00", True, ".out"),
+            "ios_arm": (b"\xcf\xfa\xed\xfe\x00\x00\x00\x00", True, ".out"),
+            "wasm": (b"\x00\x61\x73\x6d\x01\x00\x00\x00", True, ".out"),
             "c": (b"#include <stdio.h>", False, ".c"),
             "single_byte": (b"1", False, ".txt"),
             "windows": (b"MZ", True, ".txt"),

test/test_file.py

@@ -1,7 +1,7 @@
 # Copyright (C) 2021 Intel Corporation
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-""" Validates the NIST data feed
+"""Validates the NIST data feed
 1. Against their schema.
 This uses the schemas mentioned here: https://nvd.nist.gov/vuln/Data-Feeds/JSON-feed-changelog
 2. Against the provided metadata, including the sha256sum