Correct handling of generator objects #970

Reference: #970

Signed-off-by: John M. Horan <[email protected]>

Author: johnmhoran

vulnerabilities/importers/apache_tomcat.py

@@ -156,19 +156,13 @@ def extract_advisories_from_page(self, apache_tomcat_advisory_html):
         """
         Return a list of AdvisoryData objects extracted from the HTML text ``apache_tomcat_advisory_html``.
         """
-        advisories = []
-
         # This yields groups of advisories organized by Tomcat fixed versions -- 1+ per group.
         fixed_version_advisory_groups = extract_tomcat_advisory_data_from_page(
             apache_tomcat_advisory_html
         )
 
         for advisory_group in fixed_version_advisory_groups:
-            advisory_data_objects = generate_advisory_data_objects(advisory_group)
-
-            advisories.append(advisory_data_objects)
-
-        return advisories
+            yield from generate_advisory_data_objects(advisory_group)
 
 
 @dataclasses.dataclass(order=True)

vulnerabilities/tests/test_apache_tomcat.py

@@ -31,7 +31,8 @@ def test_method_extract_advisories_from_page():
         raw_data = f.read()
     extracted_advisories = ApacheTomcatImporter().extract_advisories_from_page(raw_data)
 
-    results = [adv.to_dict() for d in extracted_advisories for adv in d]
+    # results = [adv.to_dict() for d in extracted_advisories for adv in d]
+    results = [adv.to_dict() for adv in extracted_advisories]
 
     expected_file = os.path.join(
         TEST_DATA, f"parse-apache_tomcat-selected-advisories-expected.json"