Skip to content

Commit 0005f77

Browse files
committed
Remove unused import in alpine_linux.py and use a helper for loading yaml file
Signed-off-by: Shivam Sandbhor <shivam.sandbhor@gmail.com>
1 parent 79e6025 commit 0005f77

1 file changed

Lines changed: 11 additions & 13 deletions

File tree

vulnerabilities/importers/alpine_linux.py

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,13 @@
2020
# for any legal advice.
2121
# VulnerableCode is a free software code scanning tool from nexB Inc. and others.
2222
# Visit https://github.com/nexB/vulnerablecode/ for support and download.
23-
import logging
23+
2424
from typing import Any
2525
from typing import Iterable
2626
from typing import List
2727
from typing import Mapping
2828
from typing import Set
2929

30-
import yaml
3130
from packageurl import PackageURL
3231
from schema import Or
3332
from schema import Regex
@@ -36,6 +35,7 @@
3635
from vulnerabilities.data_source import Advisory
3736
from vulnerabilities.data_source import GitDataSource
3837
from vulnerabilities.data_source import Reference
38+
from vulnerabilities.helpers import load_yaml
3939

4040

4141
def validate_schema(advisory_dict):
@@ -91,19 +91,17 @@ def updated_advisories(self) -> Set[Advisory]:
9191
def _process_file(self, path) -> List[Advisory]:
9292
advisories = []
9393

94-
with open(path) as f:
95-
record = yaml.safe_load(f)
96-
97-
if record["packages"] is None:
98-
return advisories
99-
validate_schema(record)
94+
record = load_yaml(path)
95+
if record["packages"] is None:
96+
return advisories
97+
validate_schema(record)
10098

101-
for p in record["packages"]:
102-
advisories.extend(
103-
self._load_advisories(
104-
p["pkg"], record["distroversion"], record["reponame"], record["archs"],
105-
)
99+
for p in record["packages"]:
100+
advisories.extend(
101+
self._load_advisories(
102+
p["pkg"], record["distroversion"], record["reponame"], record["archs"],
106103
)
104+
)
107105

108106
return advisories
109107

0 commit comments

Comments
 (0)