IMPORTER_REGISTRY -> IMPORTERS_REGISTRY

Same for improvers
IMPROVER_REGISTRY -> IMPROVERS_REGISTRY

Signed-off-by: Hritik Vijay <hritikxx8@gmail.com>

Author: Hritik14

vulnerabilities/importers/__init__.py

@@ -21,6 +21,6 @@
 #  Visit https://github.com/nexB/vulnerablecode/ for support and download.
 from vulnerabilities.importers import nginx
 
-IMPORTERS = [nginx.NginxImporter]
+IMPORTERS_REGISTRY = [nginx.NginxImporter]
 
-IMPORTER_REGISTRY = {x.qualified_name: x for x in IMPORTERS}
+IMPORTERS_REGISTRY = {x.qualified_name: x for x in IMPORTERS_REGISTRY}

vulnerabilities/improvers/__init__.py

@@ -1,6 +1,6 @@
 from vulnerabilities.improvers import default
 from vulnerabilities import importers
 
-IMPROVERS = [default.DefaultImprover, importers.nginx.NginxBasicImprover]
+IMPROVERS_REGISTRY = [default.DefaultImprover, importers.nginx.NginxBasicImprover]
 
-IMPROVER_REGISTRY = {x.qualified_name: x for x in IMPROVERS}
+IMPROVERS_REGISTRY = {x.qualified_name: x for x in IMPROVERS_REGISTRY}

vulnerabilities/management/commands/import.py

@@ -26,7 +26,7 @@
 from django.core.management.base import BaseCommand
 from django.core.management.base import CommandError
 
-from vulnerabilities.importers import IMPORTER_REGISTRY
+from vulnerabilities.importers import IMPORTERS_REGISTRY
 from vulnerabilities.import_runner import ImportRunner
 
 
@@ -49,7 +49,7 @@ def handle(self, *args, **options):
             return
 
         if options["all"]:
-            self.import_data(IMPORTER_REGISTRY.values())
+            self.import_data(IMPORTERS_REGISTRY.values())
             return
 
         sources = options["sources"]
@@ -59,7 +59,7 @@ def handle(self, *args, **options):
         self.import_data(validate_importers(sources))
 
     def list_sources(self):
-        importers = list(IMPORTER_REGISTRY)
+        importers = list(IMPORTERS_REGISTRY)
         self.stdout.write("Vulnerability data can be imported from the following importers:")
         self.stdout.write("\n".join(importers))
 
@@ -97,7 +97,7 @@ def validate_importers(sources):
     unknown_sources = []
     for source in sources:
         try:
-            importers.append(IMPORTER_REGISTRY[source])
+            importers.append(IMPORTERS_REGISTRY[source])
         except KeyError:
             unknown_sources.append(source)
     if unknown_sources:

vulnerabilities/management/commands/improve.py

@@ -27,7 +27,7 @@
 from django.core.management.base import CommandError
 
 from vulnerabilities.import_runner import ImportRunner
-from vulnerabilities.improvers import IMPROVER_REGISTRY
+from vulnerabilities.improvers import IMPROVERS_REGISTRY
 from vulnerabilities.improve_runner import ImproveRunner
 
 
@@ -51,7 +51,7 @@ def handle(self, *args, **options):
             return
 
         if options["all"]:
-            self.improve_data(IMPROVER_REGISTRY.values())
+            self.improve_data(IMPROVERS_REGISTRY.values())
             return
 
         sources = options["sources"]
@@ -61,7 +61,7 @@ def handle(self, *args, **options):
         self.improve_data(validate_improvers(sources))
 
     def list_sources(self):
-        improvers = list(IMPROVER_REGISTRY)
+        improvers = list(IMPROVERS_REGISTRY)
         self.stdout.write("Vulnerability data can be processed by these available improvers:\n")
         self.stdout.write("\n".join(improvers))
 
@@ -95,7 +95,7 @@ def validate_improvers(sources):
     unknown_sources = []
     for source in sources:
         try:
-            improvers.append(IMPROVER_REGISTRY[source])
+            improvers.append(IMPROVERS_REGISTRY[source])
         except KeyError:
             unknown_sources.append(source)
     if unknown_sources:

vulnerabilities/tests/test_importer_yielder.py

@@ -28,7 +28,7 @@
 from vulnerabilities import importer_yielder
 from vulnerabilities.models import Importer
 
-MOCK_IMPORTER_REGISTRY = [
+MOCK_IMPORTERS_REGISTRY = [
     {
         "name": "mock_rust",
         "license": "https://creativecommons.org/publicdomain/zero/1.0/",
@@ -65,22 +65,22 @@ def setUp(self):
     def test_load_importers_freshdb(self):
         assert Importer.objects.all().count() == 0
         with patch(
-            "vulnerabilities.importer_yielder.IMPORTER_REGISTRY", new=MOCK_IMPORTER_REGISTRY
+            "vulnerabilities.importer_yielder.IMPORTERS_REGISTRY", new=MOCK_IMPORTERS_REGISTRY
         ):  # nopep8
             self.importer_yielder.load_importers()
             assert Importer.objects.all().count() == 2
 
     @pytest.mark.django_db
     def test_load_importers_setteddb(self):
         assert Importer.objects.all().count() == 0
-        mock_existing_importer = Importer.objects.create(**MOCK_IMPORTER_REGISTRY[1])
+        mock_existing_importer = Importer.objects.create(**MOCK_IMPORTERS_REGISTRY[1])
         mock_existing_importer.data_source_cfg["etags"] = {"url": "0x1234"}
         mock_existing_importer.save()
 
         assert Importer.objects.all().count() == 1
 
         with patch(
-            "vulnerabilities.importer_yielder.IMPORTER_REGISTRY", new=MOCK_IMPORTER_REGISTRY
+            "vulnerabilities.importer_yielder.IMPORTERS_REGISTRY", new=MOCK_IMPORTERS_REGISTRY
         ):  # nopep8
             self.importer_yielder.load_importers()
             assert Importer.objects.all().count() == 2

vulnerabilities/tests/test_upstream.py

@@ -5,7 +5,7 @@
 
 from vulnerabilities import importers
 from vulnerabilities.importer import Advisory
-from vulnerabilities.importer_yielder import IMPORTER_REGISTRY
+from vulnerabilities.importer_yielder import IMPORTERS_REGISTRY
 
 MAX_ADVISORIES = 1
 
@@ -18,7 +18,7 @@ class MaxAdvisoriesCreatedInterrupt(BaseException):
 @pytest.mark.webtest
 @pytest.mark.parametrize(
     ("data_source", "config"),
-    ((data["data_source"], data["data_source_cfg"]) for data in IMPORTER_REGISTRY),
+    ((data["data_source"], data["data_source_cfg"]) for data in IMPORTERS_REGISTRY),
 )
 def test_updated_advisories(data_source, config):
     if not data_source == "GitHubAPIImporter":