chore: upgrade python syntax

tests/conftest.py

@@ -71,7 +71,7 @@ def pytest_collection_modifyitems(items):
         elif module_root_dir.startswith("unit"):
             item.add_marker(pytest.mark.unit)
         else:
-            raise RuntimeError("Unknown test type (filename = {0})".format(module_path))
+            raise RuntimeError(f"Unknown test type (filename = {module_path})")
 
 
 @contextmanager
@@ -220,7 +220,7 @@ def database(request):
     def drop_database():
         janitor.drop()
 
-    return "postgresql://{}@{}:{}/{}".format(pg_user, pg_host, pg_port, pg_db)
+    return f"postgresql://{pg_user}@{pg_host}:{pg_port}/{pg_db}"
 
 
 class MockManifestCacheBuster(ManifestCacheBuster):

tests/functional/legacy_api/test_removed.py

@@ -15,7 +15,7 @@
 
 @pytest.mark.parametrize("action", ["submit", "submit_pkg_info"])
 def test_removed_upload_apis(webtest, action):
-    resp = webtest.post("/legacy/?:action={}".format(action), status=410)
+    resp = webtest.post(f"/legacy/?:action={action}", status=410)
     assert resp.status == (
         "410 Project pre-registration is no longer required or supported, "
         "upload your files instead."

tests/unit/admin/views/test_journals.py

@@ -62,12 +62,12 @@ def test_query_basic(self, db_request):
         )
         [JournalEntryFactory.create(name=project1.normalized_name) for _ in range(30)]
 
-        db_request.GET["q"] = "{}".format(project0.name)
+        db_request.GET["q"] = f"{project0.name}"
         result = views.journals_list(db_request)
 
         assert result == {
             "journals": journals0[:25],
-            "query": "{}".format(project0.name),
+            "query": f"{project0.name}",
         }
 
     def test_query_term_project(self, db_request):
@@ -83,12 +83,12 @@ def test_query_term_project(self, db_request):
         )
         [JournalEntryFactory.create(name=project1.normalized_name) for _ in range(30)]
 
-        db_request.GET["q"] = "project:{}".format(project0.name)
+        db_request.GET["q"] = f"project:{project0.name}"
         result = views.journals_list(db_request)
 
         assert result == {
             "journals": journals0[:25],
-            "query": "project:{}".format(project0.name),
+            "query": f"project:{project0.name}",
         }
 
     def test_query_term_user(self, db_request):
@@ -101,23 +101,23 @@ def test_query_term_user(self, db_request):
         )
         [JournalEntryFactory.create(submitted_by=user1) for _ in range(30)]
 
-        db_request.GET["q"] = "user:{}".format(user0.username)
+        db_request.GET["q"] = f"user:{user0.username}"
         result = views.journals_list(db_request)
 
         assert result == {
             "journals": journals0[:25],
-            "query": "user:{}".format(user0.username),
+            "query": f"user:{user0.username}",
         }
 
     def test_query_term_version(self, db_request):
         journals = [JournalEntryFactory.create() for _ in range(10)]
 
-        db_request.GET["q"] = "version:{}".format(journals[0].version)
+        db_request.GET["q"] = f"version:{journals[0].version}"
         result = views.journals_list(db_request)
 
         assert result == {
             "journals": [journals[0]],
-            "query": "version:{}".format(journals[0].version),
+            "query": f"version:{journals[0].version}",
         }
 
     def test_query_term_ip(self, db_request):
@@ -134,12 +134,12 @@ def test_query_term_ip(self, db_request):
             reverse=True,
         )
 
-        db_request.GET["q"] = "ip:{}".format(ipv4)
+        db_request.GET["q"] = f"ip:{ipv4}"
         result = views.journals_list(db_request)
 
-        assert result == {"journals": journals0, "query": "ip:{}".format(ipv4)}
+        assert result == {"journals": journals0, "query": f"ip:{ipv4}"}
 
-        db_request.GET["q"] = "ip:{}".format(ipv6)
+        db_request.GET["q"] = f"ip:{ipv6}"
         result = views.journals_list(db_request)
 
-        assert result == {"journals": journals1, "query": "ip:{}".format(ipv6)}
+        assert result == {"journals": journals1, "query": f"ip:{ipv6}"}

tests/unit/admin/views/test_projects.py

@@ -170,13 +170,13 @@ def test_version_query(self, db_request):
             reverse=True,
         )
         db_request.matchdict["project_name"] = project.normalized_name
-        db_request.GET["q"] = "version:{}".format(releases[3].version)
+        db_request.GET["q"] = f"version:{releases[3].version}"
         result = views.releases_list(project, db_request)
 
         assert result == {
             "releases": [releases[3]],
             "project": project,
-            "query": "version:{}".format(releases[3].version),
+            "query": f"version:{releases[3].version}",
         }
 
     def test_invalid_key_query(self, db_request):
@@ -187,13 +187,13 @@ def test_invalid_key_query(self, db_request):
             reverse=True,
         )
         db_request.matchdict["project_name"] = project.normalized_name
-        db_request.GET["q"] = "user:{}".format(releases[3].uploader)
+        db_request.GET["q"] = f"user:{releases[3].uploader}"
         result = views.releases_list(project, db_request)
 
         assert result == {
             "releases": releases[:25],
             "project": project,
-            "query": "user:{}".format(releases[3].uploader),
+            "query": f"user:{releases[3].uploader}",
         }
 
     def test_basic_query(self, db_request):
@@ -204,13 +204,13 @@ def test_basic_query(self, db_request):
             reverse=True,
         )
         db_request.matchdict["project_name"] = project.normalized_name
-        db_request.GET["q"] = "{}".format(releases[3].version)
+        db_request.GET["q"] = f"{releases[3].version}"
         result = views.releases_list(project, db_request)
 
         assert result == {
             "releases": releases[:25],
             "project": project,
-            "query": "{}".format(releases[3].version),
+            "query": f"{releases[3].version}",
         }
 
     def test_non_normalized_name(self, db_request):
@@ -265,13 +265,13 @@ def test_version_query(self, db_request):
             reverse=True,
         )
         db_request.matchdict["project_name"] = project.normalized_name
-        db_request.GET["q"] = "version:{}".format(journals[3].version)
+        db_request.GET["q"] = f"version:{journals[3].version}"
         result = views.journals_list(project, db_request)
 
         assert result == {
             "journals": [journals[3]],
             "project": project,
-            "query": "version:{}".format(journals[3].version),
+            "query": f"version:{journals[3].version}",
         }
 
     def test_invalid_key_query(self, db_request):
@@ -299,13 +299,13 @@ def test_basic_query(self, db_request):
             reverse=True,
         )
         db_request.matchdict["project_name"] = project.normalized_name
-        db_request.GET["q"] = "{}".format(journals[3].version)
+        db_request.GET["q"] = f"{journals[3].version}"
         result = views.journals_list(project, db_request)
 
         assert result == {
             "journals": journals[:25],
             "project": project,
-            "query": "{}".format(journals[3].version),
+            "query": f"{journals[3].version}",
         }
 
     def test_non_normalized_name(self, db_request):

tests/unit/admin/views/test_sponsors.py

@@ -32,22 +32,18 @@
 COLOR_LOGO_FILE = FieldStorage()
 COLOR_LOGO_FILE.filename = "colorlogo.png"
 COLOR_LOGO_FILE.file = io.BytesIO(
-    (
-        b"\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x01\x00\x00\x00\x01\x08\x06"
-        b"\x00\x00\x00\x1f\x15\xc4\x89\x00\x00\x00\rIDATx\xdac\xfc\xcf\xc0P\x0f\x00"
-        b"\x04\x85\x01\x80\x84\xa9\x8c!\x00\x00\x00\x00IEND\xaeB`\x82"
-    )
+    b"\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x01\x00\x00\x00\x01\x08\x06"
+    b"\x00\x00\x00\x1f\x15\xc4\x89\x00\x00\x00\rIDATx\xdac\xfc\xcf\xc0P\x0f\x00"
+    b"\x04\x85\x01\x80\x84\xa9\x8c!\x00\x00\x00\x00IEND\xaeB`\x82"
 )
 COLOR_LOGO_FILE.type = "image/png"
 
 WHITE_LOGO_FILE = FieldStorage()
 WHITE_LOGO_FILE.filename = "whitelogo.png"
 WHITE_LOGO_FILE.file = io.BytesIO(
-    (
-        b"\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x01\x00\x00\x00\x01\x08\x06"
-        b"\x00\x00\x00\x1f\x15\xc4\x89\x00\x00\x00\rIDATx\xdac\xfc\xcf\xc0P\x0f\x00"
-        b"\x04\x85\x01\x80\x84\xa9\x8c!\x00\x00\x00\x00IEND\xaeB`\x82"
-    )
+    b"\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x01\x00\x00\x00\x01\x08\x06"
+    b"\x00\x00\x00\x1f\x15\xc4\x89\x00\x00\x00\rIDATx\xdac\xfc\xcf\xc0P\x0f\x00"
+    b"\x04\x85\x01\x80\x84\xa9\x8c!\x00\x00\x00\x00IEND\xaeB`\x82"
 )
 WHITE_LOGO_FILE.type = "image/png"
 

tests/unit/admin/views/test_users.py

@@ -126,13 +126,13 @@ def test_updates_user(self, db_request):
         db_request.POST["name"] = "Jane Doe"
         db_request.POST = MultiDict(db_request.POST)
         db_request.current_route_path = pretend.call_recorder(
-            lambda: "/admin/users/{}/".format(user.username)
+            lambda: f"/admin/users/{user.username}/"
         )
 
         resp = views.user_detail(user, db_request)
 
         assert resp.status_code == 303
-        assert resp.location == "/admin/users/{}/".format(user.username)
+        assert resp.location == f"/admin/users/{user.username}/"
         assert user.name == "Jane Doe"
 
     def test_updates_user_no_primary_email(self, db_request):
@@ -146,7 +146,7 @@ def test_updates_user_no_primary_email(self, db_request):
 
         db_request.POST = MultiDict(db_request.POST)
         db_request.current_route_path = pretend.call_recorder(
-            lambda: "/admin/users/{}/".format(user.username)
+            lambda: f"/admin/users/{user.username}/"
         )
 
         resp = views.user_detail(user, db_request)
@@ -170,7 +170,7 @@ def test_updates_user_multiple_primary_emails(self, db_request):
 
         db_request.POST = MultiDict(db_request.POST)
         db_request.current_route_path = pretend.call_recorder(
-            lambda: "/admin/users/{}/".format(user.username)
+            lambda: f"/admin/users/{user.username}/"
         )
 
         resp = views.user_detail(user, db_request)
@@ -206,15 +206,15 @@ def test_add_primary_email(self, db_request):
         db_request.POST["verified"] = True
         db_request.POST = MultiDict(db_request.POST)
         db_request.route_path = pretend.call_recorder(
-            lambda *a, **kw: "/admin/users/{}/".format(user.username)
+            lambda *a, **kw: f"/admin/users/{user.username}/"
         )
 
         resp = views.user_add_email(user, db_request)
 
         db_request.db.flush()
 
         assert resp.status_code == 303
-        assert resp.location == "/admin/users/{}/".format(user.username)
+        assert resp.location == f"/admin/users/{user.username}/"
         assert len(user.emails) == 2
 
         emails = {e.email: e for e in user.emails}
@@ -233,15 +233,15 @@ def test_add_non_primary_email(self, db_request):
         db_request.POST["verified"] = True
         db_request.POST = MultiDict(db_request.POST)
         db_request.route_path = pretend.call_recorder(
-            lambda *a, **kw: "/admin/users/{}/".format(user.username)
+            lambda *a, **kw: f"/admin/users/{user.username}/"
         )
 
         resp = views.user_add_email(user, db_request)
 
         db_request.db.flush()
 
         assert resp.status_code == 303
-        assert resp.location == "/admin/users/{}/".format(user.username)
+        assert resp.location == f"/admin/users/{user.username}/"
         assert len(user.emails) == 2
 
         emails = {e.email: e for e in user.emails}
@@ -258,15 +258,15 @@ def test_add_invalid(self, db_request):
         db_request.POST["verified"] = True
         db_request.POST = MultiDict(db_request.POST)
         db_request.route_path = pretend.call_recorder(
-            lambda *a, **kw: "/admin/users/{}/".format(user.username)
+            lambda *a, **kw: f"/admin/users/{user.username}/"
         )
 
         resp = views.user_add_email(user, db_request)
 
         db_request.db.flush()
 
         assert resp.status_code == 303
-        assert resp.location == "/admin/users/{}/".format(user.username)
+        assert resp.location == f"/admin/users/{user.username}/"
         assert user.emails == []
 
     def test_user_add_email_redirects_actual_name(self, db_request):

tests/unit/admin/views/test_verdicts.py

@@ -37,8 +37,8 @@ def test_none(self, db_request):
         assert views.get_verdicts(db_request) == {
             "verdicts": [],
             "check_names": set(),
-            "classifications": set(["threat", "indeterminate", "benign"]),
-            "confidences": set(["low", "medium", "high"]),
+            "classifications": {"threat", "indeterminate", "benign"},
+            "confidences": {"low", "medium", "high"},
         }
 
     def test_some(self, db_request):
@@ -59,9 +59,9 @@ def test_some(self, db_request):
 
         assert views.get_verdicts(db_request) == {
             "verdicts": verdicts,
-            "check_names": set([check.name]),
-            "classifications": set(["threat", "indeterminate", "benign"]),
-            "confidences": set(["low", "medium", "high"]),
+            "check_names": {check.name},
+            "classifications": {"threat", "indeterminate", "benign"},
+            "confidences": {"low", "medium", "high"},
         }
 
     def test_some_with_multipage(self, db_request):
@@ -84,9 +84,9 @@ def test_some_with_multipage(self, db_request):
 
         assert views.get_verdicts(db_request) == {
             "verdicts": verdicts,
-            "check_names": set([check1.name, check2.name]),
-            "classifications": set(["threat", "indeterminate", "benign"]),
-            "confidences": set(["low", "medium", "high"]),
+            "check_names": {check1.name, check2.name},
+            "classifications": {"threat", "indeterminate", "benign"},
+            "confidences": {"low", "medium", "high"},
         }
 
     @pytest.mark.parametrize("check_name", ["check0", "check1", ""])
@@ -110,9 +110,9 @@ def test_check_name_filter(self, db_request, check_name):
 
         response = {
             "verdicts": verdicts,
-            "check_names": set(["check0", "check1", "check2"]),
-            "classifications": set(["threat", "indeterminate", "benign"]),
-            "confidences": set(["low", "medium", "high"]),
+            "check_names": {"check0", "check1", "check2"},
+            "classifications": {"threat", "indeterminate", "benign"},
+            "confidences": {"low", "medium", "high"},
         }
 
         db_request.GET["check_name"] = check_name
@@ -143,9 +143,9 @@ def test_classification_filter(self, db_request, classification):
 
         response = {
             "verdicts": verdicts,
-            "check_names": set([check.name]),
-            "classifications": set(["threat", "indeterminate", "benign"]),
-            "confidences": set(["low", "medium", "high"]),
+            "check_names": {check.name},
+            "classifications": {"threat", "indeterminate", "benign"},
+            "confidences": {"low", "medium", "high"},
         }
         assert views.get_verdicts(db_request) == response
 
@@ -172,9 +172,9 @@ def test_confidence_filter(self, db_request, confidence):
 
         response = {
             "verdicts": verdicts,
-            "check_names": set([check.name]),
-            "classifications": set(["threat", "indeterminate", "benign"]),
-            "confidences": set(["low", "medium", "high"]),
+            "check_names": {check.name},
+            "classifications": {"threat", "indeterminate", "benign"},
+            "confidences": {"low", "medium", "high"},
         }
 
         assert views.get_verdicts(db_request) == response
@@ -210,9 +210,9 @@ def test_manually_reviewed_filter(self, db_request, manually_reviewed):
 
         response = {
             "verdicts": verdicts,
-            "check_names": set([check.name]),
-            "classifications": set(["threat", "indeterminate", "benign"]),
-            "confidences": set(["low", "medium", "high"]),
+            "check_names": {check.name},
+            "classifications": {"threat", "indeterminate", "benign"},
+            "confidences": {"low", "medium", "high"},
         }
 
         assert views.get_verdicts(db_request) == response