Fix few tests to recent structure, dump ugettext_lazy

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

Author: Hritik14

vulnerabilities/importers/nginx.py

@@ -132,9 +132,9 @@ def parse_advisory_data_from_paragraph(vuln_info):
 
     For example:
     >>> paragraph = '<p>1-byte memory overwrite in resolver<br/>Severity: medium<br/><a href="http://mailman.nginx.org/pipermail/nginx-announce/2021/000300.html">Advisory</a><br/><a href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23017">CVE-2021-23017</a><br/>Not vulnerable: 1.21.0+, 1.20.1+<br/>Vulnerable: 0.6.18-1.20.0<br/><a href="/download/patch.2021.resolver.txt">The patch</a>  <a href="/download/patch.2021.resolver.txt.asc">pgp</a></p>'
-    >>> vuln_info = BeautifulSoup(paragraph).p
+    >>> vuln_info = BeautifulSoup(paragraph, features="lxml").p
     >>> parse_advisory_data_from_paragraph(vuln_info)
-    ('CVE-2021-23017', '1-byte memory overwrite in resolver', 'Severity: medium', 'Not vulnerable: 1.21.0+, 1.20.1+', 'Vulnerable: 0.6.18-1.20.0', [Reference(reference_id='', url='http://mailman.nginx.org/pipermail/nginx-announce/2021/000300.html', severities=[]), Reference(reference_id='CVE-2021-23017', url='http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23017', severities=[VulnerabilitySeverity(system=ScoringSystem(identifier='generic_textual', name='Generic textual severity rating', url='', notes='Severity for unknown scoring systems. Contains generic textual values like High, Low etc'), value='Severity: medium')]), Reference(reference_id='', url='https://nginx.org/download/patch.2021.resolver.txt', severities=[]), Reference(reference_id='', url='https://nginx.org/download/patch.2021.resolver.txt.asc', severities=[])])
+    {'aliases': ['CVE-2021-23017'], 'summary': '1-byte memory overwrite in resolver', 'advisory_severity': 'Severity: medium', 'not_vulnerable': 'Not vulnerable: 1.21.0+, 1.20.1+', 'vulnerable': 'Vulnerable: 0.6.18-1.20.0', 'references': [Reference(reference_id='', url='http://mailman.nginx.org/pipermail/nginx-announce/2021/000300.html', severities=[VulnerabilitySeverity(system=ScoringSystem(identifier='generic_textual', name='Generic textual severity rating', url='', notes='Severity for unknown scoring systems. Contains generic textual values like High, Low etc'), value='Severity: medium')]), Reference(reference_id='', url='https://nginx.org/download/patch.2021.resolver.txt', severities=[]), Reference(reference_id='', url='https://nginx.org/download/patch.2021.resolver.txt.asc', severities=[])]}
     """
     aliases = []
     summary = advisory_severity = not_vulnerable = vulnerable = None

vulnerabilities/improvers/default.py

@@ -46,14 +46,14 @@ def get_exact_purls(affected_package: AffectedPackage) -> (List[PackageURL], Pac
     Only exact version constraints (ie with an equality) are considered
     For eg:
     >>> purl = {"type": "turtle", "name": "green"}
-    >>> vers = "vers:npm/>=2.0.0,<3.0.0 | <1.0.0"
+    >>> vers = "vers:npm/<1.0.0 | >=2.0.0 | <3.0.0"
     >>> affected_package = AffectedPackage.from_dict({
     ...     "package": purl,
     ...     "affected_version_range": vers,
     ...     "fixed_version": "5.0.0"
     ... })
     >>> get_exact_purls(affected_package)
-    ({PackageURL(type='turtle', namespace=None, name='green', version='2.0.0', qualifiers={}, subpath=None)}, PackageURL(type='turtle', namespace=None, name='green', version='5.0.0', qualifiers={}, subpath=None))
+    ([PackageURL(type='turtle', namespace=None, name='green', version='2.0.0', qualifiers={}, subpath=None)], PackageURL(type='turtle', namespace=None, name='green', version='5.0.0', qualifiers={}, subpath=None))
     """
     affected_purls = set()
     all_constraints = affected_package.affected_version_range.constraints

vulnerabilities/models.py

@@ -31,7 +31,6 @@
 
 from django.db import models
 from django.core.exceptions import ValidationError
-from django.utils.translation import ugettext_lazy as _
 from django.core.validators import MinValueValidator
 from django.core.validators import MaxValueValidator
 from packageurl.contrib.django.models import PackageURLMixin
@@ -140,10 +139,8 @@ class Package(PackageURLMixin):
     # gets merged
     qualifiers = models.JSONField(
         default=dict,
-        help_text=_(
-            "Extra qualifying data for a package such as the name of an OS, "
-            "architecture, distro, etc."
-        ),
+        help_text="Extra qualifying data for a package such as the name of an OS, "
+        "architecture, distro, etc.",
         blank=True,
         null=False,
     )
@@ -187,7 +184,7 @@ def set_package_url(self, package_url):
             model_field = self._meta.get_field(field_name)
 
             if value and len(value) > model_field.max_length:
-                raise ValidationError(_('Value too long for field "{}".'.format(field_name)))
+                raise ValidationError(f'Value too long for field "{field_name}".')
 
             setattr(self, field_name, value or None)
 

vulnerabilities/tests/test_helpers.py

@@ -42,7 +42,7 @@ class TestHelpers(TestCase):
     @classmethod
     def setUpClass(cls):
         data_source_cfg = {"etags": {}}
-        cls.data_source = DummyDataSource(batch_size=1, config=data_source_cfg)
+        cls.data_source = DummyDataSource(config=data_source_cfg)
 
     def test_create_etag(self):
         assert self.data_source.config.etags == {}