Revert scraper module to its last stable state #16

Signed-off-by: Thomas Druez <tdruez@nexb.com>

Author: tdruez

README.md

@@ -24,7 +24,7 @@ Tests
 -----
 
 ```
-pycodestyle --exclude=migrations,settings.py,lib --max-line-length=100 .
+pycodestyle --exclude=migrations,settings.py,lib,tests --max-line-length=100 .
 python3.6 -m pytest -v tests/
 ```
 

scraper/debian.py

@@ -74,12 +74,7 @@ def extract_cves_from_tracker(html):
         elif tag.find_all('span', {'class': 'red'}) and tag.text == 'high**' or tag.text == 'high':
             vulnerability_status.append(tag.text)
 
-    return([{'cve_id': cve_id,
-             'package_name': name,
-             'vulnerability_status': status}
-             for cve_id, name, status in zip(cve_id,
-                                             package_name,
-                                             vulnerability_status)])
+    return cve_id, package_name, vulnerability_status
 
 
 def scrape_cves():

scraper/ubuntu.py

@@ -52,12 +52,7 @@ def extract_cves(html):
             pkg = re.findall('pkg/(.+)\.html', href)
             package_name.append(pkg[0])
 
-    return([{'cve_id': cve_id,
-             'package_name': name,
-             'vulnerability_status': status}
-           for cve_id, name, status in zip(cve_id,
-                                           package_name,
-                                           vulnerability_status)])
+    return cve_id, vulnerability_status, package_name
 
 
 def scrape_cves():

tests/test_scrapers.py

@@ -46,11 +46,10 @@ def test_ubuntu_extract_cves():
     """
 
     expected = (
-        [{'cve_id': 'CVE-2002-2439',
-          'package_name': 'gcc-4.4',
-          'vulnerability_status': 'High'}]
+        ['CVE-2002-2439'],
+        ['High'],
+        ['gcc-4.4'],
     )
-
     assert expected == ubuntu.extract_cves(test_input)
 
 
@@ -118,9 +117,9 @@ def test_debian_extract_cves_from_tracker():
     """
 
     expected = (
-        [{'cve_id': 'CVE-2016-5416',
-          'package_name': '389-ds-base',
-          'vulnerability_status': 'not yet assigned'}]
+        ['CVE-2016-5416'],
+        ['389-ds-base'],
+        ['not yet assigned'],
     )
 
     assert expected == debian.extract_cves_from_tracker(test_input)