Change data return format #6 #7

Signed-off-by: Kartik Sibal <kartiksibal@gmail.com>

Author: kartiksibal

scraper/debian.py

@@ -74,7 +74,12 @@ 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, package_name, vulnerability_status
+    return([{'cve_id': cve_id,
+             'package_name': name,
+             'vulnerability_status': status}
+             for cve_id, name, status in zip(cve_id,
+                                             package_name,
+                                             vulnerability_status)])
 
 
 def scrape_cves():

scraper/ubuntu.py

@@ -33,10 +33,18 @@
 def extract_cves(html):
     soup = bs4.BeautifulSoup(html, 'lxml')
 
+    count = 0
+
     cve_id = []
     package_name = []
     vulnerability_status = []
 
+    fields = [cve_id, vulnerability_status, package_name]
+
+    fieldss = ['cve_id', 'vulnerability_status', 'package_name']
+
+    cve = {}
+
     for tag in soup.find_all('tr'):
         if re.match('<\w+\s\w+="(\w+)">', str(tag)):
             status = re.findall('<\w+\s\w+="(\w+)">', str(tag))
@@ -52,7 +60,12 @@ def extract_cves(html):
             pkg = re.findall('pkg/(.+)\.html', href)
             package_name.append(pkg[0])
 
-    return cve_id, vulnerability_status, package_name
+    return([{'cve_id': cve_id,
+             'package_name': name,
+             'vulnerability_status': status}
+           for cve_id, name, status in zip(cve_id,
+                                           package_name,
+                                           vulnerability_status)])
 
 
 def scrape_cves():

tests/test_scrapers.py

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