Modernize type annotations

Author: mdellweg

.ci/gen_certs.py

@@ -1,14 +1,11 @@
 import argparse
 import os
 import sys
-import typing as t
 
 import trustme
 
 
-def main(argv: t.Optional[t.List[str]] = None) -> None:
-    if argv is None:
-        argv = sys.argv[1:]
+def main() -> None:
 
     parser = argparse.ArgumentParser(prog="gen_certs")
     parser.add_argument(
@@ -18,7 +15,7 @@ def main(argv: t.Optional[t.List[str]] = None) -> None:
         help="Directory where certificates and keys are written to. Defaults to cwd.",
     )
 
-    args = parser.parse_args(argv)
+    args = parser.parse_args(sys.argv[:1])
     cert_dir = args.dir
 
     if not os.path.isdir(cert_dir):

cookiecutter/ci/{{ cookiecutter.__project_name }}/.ci/gen_certs.py

@@ -1,14 +1,11 @@
 import argparse
 import os
 import sys
-import typing as t
 
 import trustme
 
 
-def main(argv: t.Optional[t.List[str]] = None) -> None:
-    if argv is None:
-        argv = sys.argv[1:]
+def main() -> None:
 
     parser = argparse.ArgumentParser(prog="gen_certs")
     parser.add_argument(
@@ -18,7 +15,7 @@ def main(argv: t.Optional[t.List[str]] = None) -> None:
         help="Directory where certificates and keys are written to. Defaults to cwd.",
     )
 
-    args = parser.parse_args(argv)
+    args = parser.parse_args(sys.argv[:1])
     cert_dir = args.dir
 
     if not os.path.isdir(cert_dir):

pulp-glue/pulp_glue/ansible/context.py

@@ -27,7 +27,7 @@ class PulpAnsibleCollectionVersionContext(PulpContentContext):
     CAPABILITIES = {"upload": [PluginRequirement("ansible", specifier=">=0.16.0")]}
 
     def upload(self, file: t.IO[bytes], **kwargs: t.Any) -> t.Any:  # type:ignore
-        repository: t.Optional[PulpRepositoryContext] = kwargs.pop("repository", None)
+        repository: PulpRepositoryContext | None = kwargs.pop("repository", None)
         if self.capable("upload"):
             chunk_size: int = kwargs.pop("chunk_size", 1000000)
             return super().upload(file, chunk_size, repository, **kwargs)
@@ -61,7 +61,7 @@ class PulpAnsibleCollectionVersionSignatureContext(PulpContentContext):
     def create(
         self,
         body: EntityDefinition,
-        parameters: t.Optional[t.Mapping[str, t.Any]] = None,
+        parameters: t.Mapping[str, t.Any] | None = None,
         non_blocking: bool = False,
     ) -> t.Any:
         self.pulp_ctx.needs_plugin(

pulp-glue/pulp_glue/common/authentication.py

@@ -15,16 +15,16 @@ def __init__(
         client_id: str,
         client_secret: str,
         token_url: str,
-        scopes: t.Optional[t.List[str]] = None,
-        verify_ssl: t.Optional[t.Union[str, bool]] = None,
+        scopes: list[str] | None = None,
+        verify_ssl: str | bool | None = None,
     ):
         self._token_server_auth = requests.auth.HTTPBasicAuth(client_id, client_secret)
         self._token_url = token_url
         self._scopes = scopes
         self._verify_ssl = verify_ssl
 
-        self._access_token: t.Optional[str] = None
-        self._expire_at: t.Optional[datetime] = None
+        self._access_token: str | None = None
+        self._expire_at: datetime | None = None
 
     def __call__(self, request: requests.PreparedRequest) -> requests.PreparedRequest:
         if self._expire_at is None or self._expire_at < datetime.now():