Skip to content

Commit e996448

Browse files
formatted code with black
1 parent 0c1c622 commit e996448

File tree

14 files changed

+55
-46
lines changed

14 files changed

+55
-46
lines changed

aboutcode/federated/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1300,7 +1300,6 @@ def from_hashids(
13001300
purl_type: str,
13011301
hashids: list[str],
13021302
) -> "DataRepository":
1303-
13041303
"""
13051304
Return a new DataRepository to store ``data_kind`` of ``purl_type`` for
13061305
a list of ``hashids``.

vulnerabilities/importer.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -593,9 +593,9 @@ def from_dict(cls, advisory_data):
593593
if pkg is not None
594594
],
595595
"references": [Reference.from_dict(ref) for ref in advisory_data["references"]],
596-
"date_published": datetime.datetime.fromisoformat(date_published)
597-
if date_published
598-
else None,
596+
"date_published": (
597+
datetime.datetime.fromisoformat(date_published) if date_published else None
598+
),
599599
"weaknesses": advisory_data["weaknesses"],
600600
"url": advisory_data.get("url") or None,
601601
}
@@ -657,9 +657,9 @@ def from_dict(cls, advisory_data):
657657
],
658658
"patches": [PatchData.from_dict(patch) for patch in advisory_data.get("patches", [])],
659659
"references": [ReferenceV2.from_dict(ref) for ref in advisory_data["references"]],
660-
"date_published": datetime.datetime.fromisoformat(date_published)
661-
if date_published
662-
else None,
660+
"date_published": (
661+
datetime.datetime.fromisoformat(date_published) if date_published else None
662+
),
663663
"weaknesses": advisory_data["weaknesses"],
664664
"severities": [
665665
VulnerabilitySeverity.from_dict(sev) for sev in advisory_data.get("severities", [])
@@ -674,7 +674,7 @@ def clean_summary(summary):
674674
# https://github.com/cms-dev/cms/issues/888#issuecomment-516977572
675675
summary = summary.strip()
676676
if summary:
677-
summary = summary.replace("\x00", "\uFFFD")
677+
summary = summary.replace("\x00", "\ufffd")
678678
return summary
679679

680680

vulnerabilities/importers/gentoo.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,11 @@ def process_file(self, file):
8686
summary=summary,
8787
references=vuln_references,
8888
affected_packages=affected_packages,
89-
url=f"https://security.gentoo.org/glsa/{id}"
90-
if id
91-
else "https://security.gentoo.org/glsa",
89+
url=(
90+
f"https://security.gentoo.org/glsa/{id}"
91+
if id
92+
else "https://security.gentoo.org/glsa"
93+
),
9294
)
9395

9496
@staticmethod

vulnerabilities/importers/mattermost.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,15 @@ def to_advisories(self, data):
103103
Reference(
104104
reference_id=ref_col.text,
105105
url=SECURITY_UPDATES_URL,
106-
severities=[
107-
VulnerabilitySeverity(
108-
system=severity_systems.CVSS31_QUALITY, value=severity_col.text
109-
)
110-
]
111-
if severity_col.text.lower() != "na"
112-
else [],
106+
severities=(
107+
[
108+
VulnerabilitySeverity(
109+
system=severity_systems.CVSS31_QUALITY, value=severity_col.text
110+
)
111+
]
112+
if severity_col.text.lower() != "na"
113+
else []
114+
),
113115
)
114116
]
115117

vulnerabilities/importers/postgresql.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@ def to_advisories(data):
7474
type="generic",
7575
qualifiers=pkg_qualifiers,
7676
),
77-
affected_version_range=GenericVersionRange.from_versions(
78-
affected_version_list
79-
)
80-
if affected_version_list
81-
else None,
77+
affected_version_range=(
78+
GenericVersionRange.from_versions(affected_version_list)
79+
if affected_version_list
80+
else None
81+
),
8282
fixed_version=GenericVersion(fixed_version) if fixed_version else None,
8383
)
8484
)

vulnerabilities/importers/redhat.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,9 @@ def to_advisory(advisory_data):
156156
affected_packages=affected_packages,
157157
references=references,
158158
weaknesses=cwe_list,
159-
url=resource_url
160-
if resource_url
161-
else "https://access.redhat.com/hydra/rest/securitydata/cve.json",
159+
url=(
160+
resource_url
161+
if resource_url
162+
else "https://access.redhat.com/hydra/rest/securitydata/cve.json"
163+
),
162164
)

vulnerabilities/improvers/gentoo.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,7 @@ class GentooBasicImprover(Improver):
9999
@property
100100
def interesting_advisories(self) -> QuerySet:
101101
return Advisory.objects.filter(
102-
Q(created_by=GentooImporter.qualified_name)
103-
| Q(created_by="gentoo_importer_v2")
102+
Q(created_by=GentooImporter.qualified_name) | Q(created_by="gentoo_importer_v2")
104103
).paginated()
105104

106105
def get_package_versions(self, package_url: PackageURL) -> List[str]:

vulnerabilities/pipelines/enhance_with_kev.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ def add_vulnerability_exploit(kev_vul, logger):
9191
"required_action": kev_vul["requiredAction"],
9292
"due_date": kev_vul["dueDate"],
9393
"notes": kev_vul["notes"],
94-
"known_ransomware_campaign_use": True
95-
if kev_vul["knownRansomwareCampaignUse"] == "Known"
96-
else False,
94+
"known_ransomware_campaign_use": (
95+
True if kev_vul["knownRansomwareCampaignUse"] == "Known" else False
96+
),
9797
},
9898
)
9999
return 1

vulnerabilities/pipelines/v2_improvers/collect_ssvc_trees.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,11 +135,11 @@ def convert_vector_to_tree_and_decision(vector: str):
135135
options.append({name: mapping[value]})
136136

137137
options.sort(
138-
key=lambda o: VECTOR_ORDER.index(
139-
next(k for k, _ in REVERSE_POINTS.values() if k == next(iter(o)))
138+
key=lambda o: (
139+
VECTOR_ORDER.index(next(k for k, _ in REVERSE_POINTS.values() if k == next(iter(o))))
140+
if False
141+
else 0
140142
)
141-
if False
142-
else 0
143143
)
144144

145145
return options, decision

vulnerabilities/pipelines/v2_improvers/enhance_with_kev.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ def add_vulnerability_exploit(kev_vul, logger):
9595
"required_action": kev_vul["requiredAction"],
9696
"due_date": kev_vul["dueDate"],
9797
"notes": kev_vul["notes"],
98-
"known_ransomware_campaign_use": True
99-
if kev_vul["knownRansomwareCampaignUse"] == "Known"
100-
else False,
98+
"known_ransomware_campaign_use": (
99+
True if kev_vul["knownRansomwareCampaignUse"] == "Known" else False
100+
),
101101
},
102102
)
103103
return 1

0 commit comments

Comments
 (0)