Skip to content

Commit 6d8ed83

Browse files
committed
Use 'with' handler for urlopen() and fix other nits
Signed-off-by: sbs2001 <shivam.sandbhor@gmail.com>
1 parent 1551e31 commit 6d8ed83

2 files changed

Lines changed: 11 additions & 8 deletions

File tree

vulnerabilities/data_dump.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ def rust_dump(extract_data):
244244
for version in package_data['affected_versions']:
245245
affected_package = Package.objects.create(
246246
name=package_data['package_name'],
247-
type='crate',
247+
type='cargo',
248248
version=version
249249
)
250250
ImpactedPackage.objects.create(
@@ -255,7 +255,7 @@ def rust_dump(extract_data):
255255
for version in package_data['fixed_versions']:
256256
unaffected_package = Package.objects.create(
257257
name=package_data['package_name'],
258-
type='crate',
258+
type='cargo',
259259
version=version
260260
)
261261
ResolvedPackage.objects.create(

vulnerabilities/scraper/rust.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1+
from io import BytesIO
12
import json
3+
4+
from dephell_specifier import RangeSpecifier
25
import pytoml as toml
36
from urllib.request import urlopen
47
import urllib.request
58
from urllib.error import HTTPError
6-
from io import BytesIO
79
from zipfile import ZipFile
8-
from dephell_specifier import RangeSpecifier
10+
911

1012
RUSTSEC_DB_URL = 'https://github.com/RustSec/advisory-db/archive/master.zip'
1113

@@ -19,10 +21,11 @@ def rust_crate_advisories(url, prefix='advisory-db-master/crates/'):
1921

2022

2123
def all_versions_of_crate(crate):
22-
info_url = "https://crates.io//api/v1/crates/{}".format(crate)
23-
info = json.load(urlopen(info_url))
24-
for version_info in info['versions']:
25-
yield version_info['num']
24+
info_url = "https://crates.io/api/v1/crates/{}".format(crate)
25+
with urlopen(info_url) as info:
26+
info = json.load(info)
27+
for version_info in info['versions']:
28+
yield version_info['num']
2629

2730

2831
def import_vulnerabilities():

0 commit comments

Comments
 (0)