Run 'make valid' #1287

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

Author: johnmhoran

vulnerabilities/templatetags/url_filters.py

@@ -5,6 +5,7 @@
 
 register = template.Library()
 
-@register.filter(name='url_quote')
+
+@register.filter(name="url_quote")
 def url_quote_filter(value):
     return quote(str(value))

vulnerabilities/tests/test_view.py

@@ -207,7 +207,7 @@ def test_sorted_queryset(self):
 
         pkg_package_urls = [obj.package_url for obj in sorted_pkgs_qs_all]
         sorted_purls = os.path.join(TEST_DIR, "sorted_purls.txt")
-        with open(sorted_purls, 'r') as f:
+        with open(sorted_purls, "r") as f:
             expected_content = f.read().splitlines()
             assert pkg_package_urls == expected_content
 
@@ -236,16 +236,40 @@ def test_get_purl_version_class(self):
 
 
 class TestCustomFilters:
-    @pytest.mark.parametrize("input_value, expected_output", [
-        ("pkg:rpm/redhat/[email protected]?arch=el6sat", "pkg%3Arpm/redhat/katello-client-bootstrap%401.1.0-2%3Farch%3Del6sat"),
-        ("pkg:alpine/[email protected]?arch=armhf&distroversion=v3.5&reponame=main", "pkg%3Aalpine/nginx%401.10.3-r1%3Farch%3Darmhf%26distroversion%3Dv3.5%26reponame%3Dmain"),
-        ("pkg:nginx/[email protected]?os=windows", "pkg%3Anginx/nginx%400.9.0%3Fos%3Dwindows"),
-        ("pkg:deb/ubuntu/[email protected]~intrepid1", "pkg%3Adeb/ubuntu/nginx%400.6.34-2ubuntu1~intrepid1"),
-        ("pkg:rpm/redhat/openssl@1:1.0.2k-16.el7_6?arch=1", "pkg%3Arpm/redhat/openssl%401%3A1.0.2k-16.el7_6%3Farch%3D1"),
-        ("pkg:golang/google.golang.org/genproto#googleapis/api/annotations", "pkg%3Agolang/google.golang.org/genproto%23googleapis/api/annotations"),
-        ("pkg:cocoapods/[email protected]#NSData+zlib", "pkg%3Acocoapods/GoogleUtilities%407.5.2%23NSData%2Bzlib"),
-        ("pkg:conda/[email protected]?build=py36h06a4308_0&channel=main&subdir=linux-64&type=tar.bz2", "pkg%3Aconda/absl-py%400.4.1%3Fbuild%3Dpy36h06a4308_0%26channel%3Dmain%26subdir%3Dlinux-64%26type%3Dtar.bz2"),
-    ])
+    @pytest.mark.parametrize(
+        "input_value, expected_output",
+        [
+            (
+                "pkg:rpm/redhat/[email protected]?arch=el6sat",
+                "pkg%3Arpm/redhat/katello-client-bootstrap%401.1.0-2%3Farch%3Del6sat",
+            ),
+            (
+                "pkg:alpine/[email protected]?arch=armhf&distroversion=v3.5&reponame=main",
+                "pkg%3Aalpine/nginx%401.10.3-r1%3Farch%3Darmhf%26distroversion%3Dv3.5%26reponame%3Dmain",
+            ),
+            ("pkg:nginx/[email protected]?os=windows", "pkg%3Anginx/nginx%400.9.0%3Fos%3Dwindows"),
+            (
+                "pkg:deb/ubuntu/[email protected]~intrepid1",
+                "pkg%3Adeb/ubuntu/nginx%400.6.34-2ubuntu1~intrepid1",
+            ),
+            (
+                "pkg:rpm/redhat/openssl@1:1.0.2k-16.el7_6?arch=1",
+                "pkg%3Arpm/redhat/openssl%401%3A1.0.2k-16.el7_6%3Farch%3D1",
+            ),
+            (
+                "pkg:golang/google.golang.org/genproto#googleapis/api/annotations",
+                "pkg%3Agolang/google.golang.org/genproto%23googleapis/api/annotations",
+            ),
+            (
+                "pkg:cocoapods/[email protected]#NSData+zlib",
+                "pkg%3Acocoapods/GoogleUtilities%407.5.2%23NSData%2Bzlib",
+            ),
+            (
+                "pkg:conda/[email protected]?build=py36h06a4308_0&channel=main&subdir=linux-64&type=tar.bz2",
+                "pkg%3Aconda/absl-py%400.4.1%3Fbuild%3Dpy36h06a4308_0%26channel%3Dmain%26subdir%3Dlinux-64%26type%3Dtar.bz2",
+            ),
+        ],
+    )
     def test_url_quote_filter(self, input_value, expected_output):
         filtered = url_quote_filter(input_value)
         assert filtered == expected_output

vulnerabilities/views.py

@@ -51,6 +51,7 @@ def purl_sort_key(purl: models.Package):
         purl_sort_version = purl_version_class(purl.version)
     return (purl.type, purl.namespace, purl.name, purl_sort_version, purl.qualifiers, purl.subpath)
 
+
 def get_purl_version_class(purl: models.Package):
     RANGE_CLASS_BY_SCHEMES["alpine"] = AlpineLinuxVersionRange
     purl_version_class = None
@@ -194,7 +195,10 @@ def get_context_data(self, **kwargs):
                     and (fixed_by_package.name == sorted_affected_package.name)
                     and (fixed_by_package.qualifiers == sorted_affected_package.qualifiers)
                     and (fixed_by_package.subpath == sorted_affected_package.subpath)
-                    and (fixed_by_version_class(fixed_by_package.version) > sorted_affected_version_class(sorted_affected_package.version))
+                    and (
+                        fixed_by_version_class(fixed_by_package.version)
+                        > sorted_affected_version_class(sorted_affected_package.version)
+                    )
                 ):
                     matched_fixed_by_packages.append(fixed_by_package.purl)
             affected_fixed_by_matches["matched_fixed_by_packages"] = matched_fixed_by_packages