fix(typing): update type hints for dropping python 3.9

Author: lepture

src/joserfc/_keys.py

@@ -1,4 +1,3 @@
-from __future__ import annotations
 import typing as t
 import random
 from ._rfc7517.types import AnyKey, KeyParameters, DictKey
@@ -44,7 +43,7 @@ class JWKRegistry:
         key = JWKRegistry.import_key(data)
     """
 
-    key_types: dict[str, t.Type[Key]] = {
+    key_types: dict[str, type[Key]] = {
         OctKey.key_type: OctKey,
         RSAKey.key_type: RSAKey,
         ECKey.key_type: ECKey,
@@ -110,7 +109,7 @@ class KeySet:
     #: keys in the key set
     keys: list[Key]
 
-    registry_cls: t.Type[JWKRegistry] = JWKRegistry
+    registry_cls: type[JWKRegistry] = JWKRegistry
     algorithm_keys: t.ClassVar[dict[str, list[str]]] = {}
 
     def __init__(self, keys: list[Key]):

src/joserfc/_rfc7515/compact.py

@@ -1,4 +1,4 @@
-import typing as t
+from typing import Any
 from .model import JWSAlgModel, CompactSignature
 from ..errors import (
     DecodeError,
@@ -19,15 +19,15 @@
 ]
 
 
-def sign_compact(obj: CompactSignature, alg: JWSAlgModel, key: t.Any) -> bytes:
+def sign_compact(obj: CompactSignature, alg: JWSAlgModel, key: Any) -> bytes:
     header_segment = json_b64encode(obj.headers())
     payload_segment = urlsafe_b64encode(obj.payload)
     signing_input = header_segment + b"." + payload_segment
     signature = urlsafe_b64encode(alg.sign(signing_input, key))
     return signing_input + b"." + signature
 
 
-def verify_compact(obj: CompactSignature, alg: JWSAlgModel, key: t.Any) -> bool:
+def verify_compact(obj: CompactSignature, alg: JWSAlgModel, key: Any) -> bool:
     signing_input = obj.segments["header"] + b"." + obj.segments["payload"]
     try:
         sig = urlsafe_b64decode(obj.segments["signature"])
@@ -43,9 +43,9 @@ def detach_compact_content(value: str) -> str:
     return ".".join(parts)
 
 
-def decode_header(header_segment: bytes) -> dict[str, t.Any]:
+def decode_header(header_segment: bytes) -> dict[str, Any]:
     try:
-        protected: dict[str, t.Any] = json_b64decode(header_segment)
+        protected: dict[str, Any] = json_b64decode(header_segment)
         if "alg" not in protected:
             raise MissingAlgorithmError()
     except (TypeError, ValueError):

src/joserfc/_rfc7515/json.py

@@ -1,6 +1,5 @@
-from __future__ import annotations
-import typing as t
 import copy
+from typing import Any, Callable
 from .model import (
     HeaderMember,
     GeneralJSONSignature,
@@ -33,7 +32,7 @@
     "detach_json_content",
 ]
 
-FindKey = t.Callable[[HeaderMember], t.Any]
+FindKey = Callable[[HeaderMember], Any]
 
 
 def sign_general_json(
@@ -156,7 +155,7 @@ def verify_signature(
     return alg.verify(signing_input, sig, key)
 
 
-def detach_json_content(value: dict[str, t.Any]) -> dict[str, t.Any]:
+def detach_json_content(value: dict[str, Any]) -> dict[str, Any]:
     # https://www.rfc-editor.org/rfc/rfc7515#appendix-F
     rv = copy.deepcopy(value)  # don't alter original value
     if "payload" in rv:

src/joserfc/_rfc7515/model.py

@@ -1,4 +1,3 @@
-from __future__ import annotations
 from typing import Any, ClassVar, Literal
 from abc import ABCMeta, abstractmethod
 from .types import SegmentsDict, JSONSignatureDict

src/joserfc/_rfc7515/registry.py

@@ -1,4 +1,3 @@
-from __future__ import annotations
 import warnings
 from typing import Any
 from collections.abc import Collection

src/joserfc/_rfc7515/types.py

@@ -1,4 +1,4 @@
-import typing as t
+from typing import TypedDict, final
 from ..registry import Header
 
 __all__ = [
@@ -10,31 +10,31 @@
 ]
 
 
-class SegmentsDict(t.TypedDict, total=False):
+class SegmentsDict(TypedDict, total=False):
     header: bytes
     payload: bytes
     signature: bytes
 
 
-class HeaderDict(t.TypedDict, total=False):
+class HeaderDict(TypedDict, total=False):
     protected: Header
     header: Header
 
 
-class JSONSignatureDict(t.TypedDict, total=False):
+class JSONSignatureDict(TypedDict, total=False):
     protected: str
     header: Header
     signature: str
 
 
-@t.final
-class GeneralJSONSerialization(t.TypedDict):
+@final
+class GeneralJSONSerialization(TypedDict):
     payload: str
     signatures: list[JSONSignatureDict]
 
 
-@t.final
-class FlattenedJSONSerialization(t.TypedDict, total=False):
+@final
+class FlattenedJSONSerialization(TypedDict, total=False):
     payload: str
     protected: str
     header: Header

src/joserfc/_rfc7516/json.py

@@ -1,5 +1,4 @@
-from __future__ import annotations
-import typing as t
+from typing import Any
 from .models import (
     BaseJSONEncryption,
     GeneralJSONEncryption,
@@ -56,8 +55,8 @@ def represent_flattened_json(obj: FlattenedJSONEncryption) -> FlattenedJSONSeria
     return data
 
 
-def __represent_json_serialization(obj: BaseJSONEncryption) -> t.Any:
-    data: dict[str, t.Any] = {
+def __represent_json_serialization(obj: BaseJSONEncryption) -> Any:
+    data: dict[str, Any] = {
         "protected": to_str(json_b64encode(obj.protected)),
         "iv": to_str(obj.base64_segments["iv"]),
         "ciphertext": to_str(obj.base64_segments["ciphertext"]),
@@ -103,9 +102,9 @@ def extract_flattened_json(data: FlattenedJSONSerialization, registry: JWERegist
 
 
 def __extract_segments(
-    data: t.Union[GeneralJSONSerialization, FlattenedJSONSerialization],
+    data: GeneralJSONSerialization | FlattenedJSONSerialization,
     registry: JWERegistry,
-) -> tuple[dict[str, bytes], dict[str, bytes], t.Optional[bytes]]:
+) -> tuple[dict[str, bytes], dict[str, bytes], bytes | None]:
     base64_segments: dict[str, bytes] = {
         "iv": to_bytes(data["iv"]),
         "ciphertext": to_bytes(data["ciphertext"]),

src/joserfc/_rfc7516/message.py

@@ -1,5 +1,5 @@
 import secrets
-import typing as t
+from typing import Any, Union
 
 from .models import (
     CompactEncryption,
@@ -33,7 +33,7 @@
     "perform_decrypt",
 ]
 
-EncryptionData = t.Union[CompactEncryption, GeneralJSONEncryption, FlattenedJSONEncryption]
+EncryptionData = Union[CompactEncryption, GeneralJSONEncryption, FlattenedJSONEncryption]
 
 
 def perform_encrypt(obj: EncryptionData, registry: JWERegistry) -> None:
@@ -137,10 +137,10 @@ def _perform_decrypt(obj: EncryptionData, registry: JWERegistry) -> None:
 
 
 def pre_encrypt_recipients(
-    enc: JWEEncModel, recipients: list[Recipient[t.Any]], registry: JWERegistry
-) -> tuple[bytes, list[tuple[JWEKeyAgreement, Recipient[t.Any]]]]:
+    enc: JWEEncModel, recipients: list[Recipient[Any]], registry: JWERegistry
+) -> tuple[bytes, list[tuple[JWEKeyAgreement, Recipient[Any]]]]:
     cek: bytes = b""
-    delayed_tasks: list[tuple[JWEKeyAgreement, Recipient[t.Any]]] = []
+    delayed_tasks: list[tuple[JWEKeyAgreement, Recipient[Any]]] = []
     for recipient in recipients:
         alg = __prepare_recipient_algorithm(recipient, registry)
 
@@ -167,7 +167,7 @@ def pre_encrypt_recipients(
     return cek, delayed_tasks
 
 
-def __prepare_recipient_algorithm(recipient: Recipient[t.Any], registry: JWERegistry) -> JWEAlgModel:
+def __prepare_recipient_algorithm(recipient: Recipient[Any], registry: JWERegistry) -> JWEAlgModel:
     headers = recipient.headers()
     registry.check_header(headers)
     # 1. Determine the Key Management Mode employed by the algorithm used
@@ -181,7 +181,7 @@ def __prepare_recipient_algorithm(recipient: Recipient[t.Any], registry: JWERegi
     return alg
 
 
-def __pre_encrypt_direct_mode(alg: JWEAlgModel, enc: JWEEncModel, recipient: Recipient[t.Any]) -> bytes:
+def __pre_encrypt_direct_mode(alg: JWEAlgModel, enc: JWEEncModel, recipient: Recipient[Any]) -> bytes:
     cek: bytes
     if isinstance(alg, JWEKeyAgreement):
         # 3. When Direct Key Agreement is employed,
@@ -202,7 +202,7 @@ def __pre_encrypt_direct_mode(alg: JWEAlgModel, enc: JWEEncModel, recipient: Rec
 
 
 def post_encrypt_recipients(
-    enc: JWEEncModel, tasks: list[tuple[JWEKeyAgreement, Recipient[t.Any]]], cek: bytes, tag: bytes
+    enc: JWEEncModel, tasks: list[tuple[JWEKeyAgreement, Recipient[Any]]], cek: bytes, tag: bytes
 ) -> None:
     for alg, recipient in tasks:
         if alg.tag_aware:
@@ -214,7 +214,7 @@ def post_encrypt_recipients(
         recipient.encrypted_key = alg.wrap_cek_with_auk(cek, agreed_upon_key)
 
 
-def decrypt_recipient(alg: JWEAlgModel, enc: JWEEncModel, recipient: Recipient[t.Any], tag: bytes) -> bytes:
+def decrypt_recipient(alg: JWEAlgModel, enc: JWEEncModel, recipient: Recipient[Any], tag: bytes) -> bytes:
     cek: bytes
     if alg.direct_mode:
         # 10.  When Direct Key Agreement or Direct Encryption are employed,

src/joserfc/_rfc7516/models.py

@@ -1,4 +1,3 @@
-from __future__ import annotations
 import typing as t
 import secrets
 from abc import ABCMeta, abstractmethod

src/joserfc/_rfc7516/registry.py

@@ -1,4 +1,3 @@
-from __future__ import annotations
 import warnings
 import typing as t
 from collections.abc import Collection