chore: upgrade python syntax

bin/depchecker.py

@@ -23,11 +23,11 @@
 
 if extra_in_left:
     for dep in sorted(extra_in_left):
-        print("- {}".format(dep))
+        print(f"- {dep}")
 
 if extra_in_right:
     for dep in sorted(extra_in_right):
-        print("+ {}".format(dep))
+        print(f"+ {dep}")
 
 if extra_in_left or extra_in_right:
     sys.exit(1)

bin/lint

@@ -11,6 +11,7 @@ export LANG="${ENCODING:-en_US.UTF-8}"
 set -x
 
 # Actually run our tests.
+find . -name '*.py' -exec python -m pyupgrade --py311-plus {} +
 python -m flake8 .
 python -m black --check *.py warehouse/ tests/
 python -m isort --check *.py warehouse/ tests/

docs/conf.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

requirements/lint.in

@@ -5,6 +5,7 @@ pep8-naming
 black==22.12.0
 docutils<0.19
 isort>=5
+pyupgrade
 mypy
 celery-types
 msgpack-types

requirements/lint.txt

@@ -144,13 +144,28 @@ pygments==2.13.0 \
     --hash=sha256:56a8508ae95f98e2b9bdf93a6be5ae3f7d8af858b43e02c5a2ff083726be40c1 \
     --hash=sha256:f643f331ab57ba3c9d89212ee4a2dabc6e94f117cf4eefde99a0574720d14c42
     # via doc8
+pyupgrade==3.3.1 \
+    --hash=sha256:3b93641963df022d605c78aeae4b5956a5296ea24701eafaef9c487527b77e60 \
+    --hash=sha256:f88bce38b0ba92c2a9a5063c8629e456e8d919b67d2d42c7ecab82ff196f9813
+    # via -r requirements/lint.in
 restructuredtext-lint==1.4.0 \
     --hash=sha256:1b235c0c922341ab6c530390892eb9e92f90b9b75046063e047cacfb0f050c45
     # via doc8
+setuptools==65.6.3 \
+    --hash=sha256:57f6f22bde4e042978bcd50176fdb381d7c21a9efa4041202288d3737a0c6a54 \
+    --hash=sha256:a7620757bf984b58deaf32fc8a4577a9bbc0850cf92c20e1ce41c38c19e5fb75
+    # via
+    #   zope-event
+    #   zope-interface
+    #   zope-schema
 stevedore==4.1.1 \
     --hash=sha256:7f8aeb6e3f90f96832c301bff21a7eb5eefbe894c88c506483d355565d88cc1a \
     --hash=sha256:aa6436565c069b2946fe4ebff07f5041e0c8bf18c7376dd29edf80cf7d524e4e
     # via doc8
+tokenize-rt==5.0.0 \
+    --hash=sha256:3160bc0c3e8491312d0485171dea861fc160a240f5f5766b72a1165408d10740 \
+    --hash=sha256:c67772c662c6b3dc65edf66808577968fb10badfc2042e3027196bed4daf9e5a
+    # via pyupgrade
 toml==0.10.2 \
     --hash=sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b \
     --hash=sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f
@@ -290,12 +305,3 @@ zope-schema==6.2.1 \
     --hash=sha256:843c6fce13886333f707246f135a832f4408555ca9650f07ed6e4d429302f349 \
     --hash=sha256:e3b33c8bc8ba9d85a56713ab8f0a3c2615d54a8085f1e415ce0c8dfb5e540be6
     # via mypy-zope
-
-# The following packages are considered to be unsafe in a requirements file:
-setuptools==65.6.3 \
-    --hash=sha256:57f6f22bde4e042978bcd50176fdb381d7c21a9efa4041202288d3737a0c6a54 \
-    --hash=sha256:a7620757bf984b58deaf32fc8a4577a9bbc0850cf92c20e1ce41c38c19e5fb75
-    # via
-    #   zope-event
-    #   zope-interface
-    #   zope-schema

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):