Skip to content

Commit a69f535

Browse files
authored
chore: update inconsistency in files with black v24.1.1 (#3799)
1 parent fe1f82b commit a69f535

File tree

9 files changed

+41
-31
lines changed

9 files changed

+41
-31
lines changed

cve_bin_tool/checkers/bind.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class BindChecker(Checker):
3232
VERSION_PATTERNS = [
3333
r"version: BIND ([0-9]+\.[0-9]+\.[0-9]+)", # for .rpm, .tgz, etc.
3434
r"(?:lib|/)bind[0-9]*-([0-9]+\.[0-9]+\.[0-9]+)", # for .deb
35-
r"/bind9-([0-9]+\.[0-9]+\.[0-9]+)" # using buildpath if included
35+
r"/bind9-([0-9]+\.[0-9]+\.[0-9]+)", # using buildpath if included
3636
# If you trust the filenames to contain the right version number enable the following regular expressions:
3737
# r"libisc-([0-9]+\.[0-9]+\.[0-9]+)", # for libisc
3838
# r"libisccfg-([0-9]+\.[0-9]+\.[0-9]+)", # for libisccfg

cve_bin_tool/checkers/binutils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class BinutilsChecker(Checker):
4848
# readelf - Displays information from any ELF format object file.
4949
# size - Lists the section sizes of an object or archive file.
5050
# strings - Lists printable strings from files.
51-
r"can't set BFD default target to `%s': %s"
51+
r"can't set BFD default target to `%s': %s",
5252
# strip - Discards symbols.
5353
# windmc - A Windows compatible message compiler.get_ver
5454
# windres - A compiler for Windows resource files.

cve_bin_tool/checkers/cups.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
class CupsChecker(Checker):
1919
CONTAINS_PATTERNS = [
2020
r"No limit for CUPS-Get-Document defined in policy %s and no suitable template found.",
21-
r"\*%%%%%%%% Created by the CUPS PPD Compiler CUPS v([0-9]+\.[0-9]+\.[0-9]+)"
21+
r"\*%%%%%%%% Created by the CUPS PPD Compiler CUPS v([0-9]+\.[0-9]+\.[0-9]+)",
2222
# Alternate optional contains patterns,
2323
# see https://github.com/intel/cve-bin-tool/tree/main/cve_bin_tool/checkers#helper-script for more details
2424
# r"Unable to edit cupsd.conf files larger than 1MB",

cve_bin_tool/data_sources/gad_source.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -304,9 +304,11 @@ def format_data(self, all_cve_entries):
304304
"score": score if vector[0] is not None else "unknown",
305305
"CVSS_version": str(version) if vector[0] is not None else "unknown",
306306
"CVSS_vector": vector if vector[0] is not None else "unknown",
307-
"last_modified": cve_item["date"]
308-
if cve_item.get("date", None)
309-
else cve_item["pubdate"],
307+
"last_modified": (
308+
cve_item["date"]
309+
if cve_item.get("date", None)
310+
else cve_item["pubdate"]
311+
),
310312
}
311313

312314
severity_data.append(cve)

cve_bin_tool/data_sources/nvd_source.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,11 @@ def format_data(self, all_cve_entries):
128128
"score": "unknown",
129129
"CVSS_version": "unknown",
130130
"CVSS_vector": "unknown",
131-
"last_modified": cve_item["lastModifiedDate"]
132-
if cve_item.get("lastModifiedDate", None)
133-
else cve_item["publishedDate"],
131+
"last_modified": (
132+
cve_item["lastModifiedDate"]
133+
if cve_item.get("lastModifiedDate", None)
134+
else cve_item["publishedDate"]
135+
),
134136
}
135137
if cve["description"].startswith("** REJECT **"):
136138
# Skip this CVE if it's marked as 'REJECT'
@@ -226,9 +228,11 @@ def format_data_api2(self, all_cve_entries):
226228
"score": "unknown",
227229
"CVSS_version": "unknown",
228230
"CVSS_vector": "unknown",
229-
"last_modified": cve_item["lastModified"]
230-
if cve_item.get("lastModified", None)
231-
else cve_item["published"],
231+
"last_modified": (
232+
cve_item["lastModified"]
233+
if cve_item.get("lastModified", None)
234+
else cve_item["published"]
235+
),
232236
}
233237
if cve["description"].startswith("** REJECT **"):
234238
# Skip this CVE if it's marked as 'REJECT'

cve_bin_tool/data_sources/osv_source.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -285,9 +285,11 @@ def format_data(self, all_cve_entries):
285285
"score": score if vector is not None else "unknown",
286286
"CVSS_version": version if vector is not None else "unknown",
287287
"CVSS_vector": vector if vector is not None else "unknown",
288-
"last_modified": cve_item["modified"]
289-
if cve_item.get("modified", None)
290-
else cve_item["published"],
288+
"last_modified": (
289+
cve_item["modified"]
290+
if cve_item.get("modified", None)
291+
else cve_item["published"]
292+
),
291293
}
292294

293295
severity_data.append(cve)

cve_bin_tool/nvd_api.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,10 +158,10 @@ async def get_nvd_params(
158158
if time_of_last_update:
159159
# Fetch all the updated CVE entries from the modified date. Subtracting 2-minute offset for updating cve entries
160160
if self.api_version == "2.0":
161-
self.params[
162-
"lastModStartDate"
163-
] = self.convert_date_to_nvd_date_api2(
164-
time_of_last_update - timedelta(minutes=2)
161+
self.params["lastModStartDate"] = (
162+
self.convert_date_to_nvd_date_api2(
163+
time_of_last_update - timedelta(minutes=2)
164+
)
165165
)
166166
self.params["lastModEndDate"] = self.convert_date_to_nvd_date_api2(
167167
datetime.now()

cve_bin_tool/output_engine/__init__.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -481,9 +481,9 @@ def output_pdf(
481481
pdfdoc.paragraph(
482482
"The table given below gives CVE found with there score on different metrics."
483483
)
484-
cve_by_metrics: defaultdict[
485-
Remarks, list[dict[str, str]]
486-
] = defaultdict(list)
484+
cve_by_metrics: defaultdict[Remarks, list[dict[str, str]]] = (
485+
defaultdict(list)
486+
)
487487
col_headings = [
488488
"CVE Number",
489489
"CVSS_version",
@@ -920,9 +920,9 @@ def generate_sbom(
920920
my_package.set_licenseconcluded(license)
921921
my_package.set_supplier("UNKNOWN", "NOASSERTION")
922922
# Store package data
923-
sbom_packages[
924-
(my_package.get_name(), my_package.get_value("version"))
925-
] = my_package.get_package()
923+
sbom_packages[(my_package.get_name(), my_package.get_value("version"))] = (
924+
my_package.get_package()
925+
)
926926
sbom_relationship.initialise()
927927
sbom_relationship.set_relationship(parent, "DESCRIBES", root_package)
928928
sbom_relationships.append(sbom_relationship.get_relationship())
@@ -935,9 +935,9 @@ def generate_sbom(
935935
my_package.set_supplier("Organization", product_data.vendor)
936936
my_package.set_licensedeclared(license)
937937
my_package.set_licenseconcluded(license)
938-
sbom_packages[
939-
(my_package.get_name(), my_package.get_value("version"))
940-
] = my_package.get_package()
938+
sbom_packages[(my_package.get_name(), my_package.get_value("version"))] = (
939+
my_package.get_package()
940+
)
941941
sbom_relationship.initialise()
942942
sbom_relationship.set_relationship(
943943
root_package, "DEPENDS_ON", product_data.product

cve_bin_tool/output_engine/html.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -368,9 +368,11 @@ def output_html(
368368
vendor=product_info.vendor,
369369
name=product_info.product,
370370
version=product_info.version,
371-
cve_count=0
372-
if cve_data["cves"][0][1] == "UNKNOWN"
373-
else len(cve_data["cves"]),
371+
cve_count=(
372+
0
373+
if cve_data["cves"][0][1] == "UNKNOWN"
374+
else len(cve_data["cves"])
375+
),
374376
severity_analysis=analysis_pie.to_html(
375377
full_html=False, include_plotlyjs=False
376378
),

0 commit comments

Comments
 (0)