Remove Optional and Union, fix Type

Author: jschlyter

src/cryptojwt/jwe/fernet.py

@@ -1,6 +1,5 @@
 import base64
 import os
-from typing import Optional, Union
 
 from cryptography.fernet import Fernet
 from cryptography.hazmat.primitives import hashes
@@ -15,12 +14,12 @@
 class FernetEncrypter(Encrypter):
     def __init__(
         self,
-        password: Optional[str] = None,
-        salt: Optional[bytes] = "",
-        key: Optional[bytes] = None,
-        hash_alg: Optional[str] = "SHA256",
-        digest_size: Optional[int] = 0,
-        iterations: Optional[int] = DEFAULT_ITERATIONS,
+        password: str | None = None,
+        salt: bytes | None = "",
+        key: bytes | None = None,
+        hash_alg: str | None = "SHA256",
+        digest_size: int | None = 0,
+        iterations: int | None = DEFAULT_ITERATIONS,
     ):
         Encrypter.__init__(self)
 
@@ -45,14 +44,14 @@ def __init__(
 
         self.core = Fernet(self.key)
 
-    def encrypt(self, msg: Union[str, bytes], **kwargs) -> bytes:
+    def encrypt(self, msg: str | bytes, **kwargs) -> bytes:
         text = as_bytes(msg)
         # Padding to block size of AES
         if len(text) % 16:
             text += b" " * (16 - len(text) % 16)
         return self.core.encrypt(as_bytes(text))
 
-    def decrypt(self, msg: Union[str, bytes], **kwargs) -> bytes:
+    def decrypt(self, msg: str | bytes, **kwargs) -> bytes:
         dec_text = self.core.decrypt(as_bytes(msg))
         dec_text = dec_text.rstrip(b" ")
         return dec_text

src/cryptojwt/jwt.py

@@ -7,7 +7,6 @@
 import uuid
 from collections.abc import MutableMapping
 from json import JSONDecodeError
-from typing import Optional
 
 from .exception import HeaderError, VerificationError
 from .jwe.jwe import JWE, factory as jwe_factory
@@ -84,15 +83,15 @@ def __init__(
         encrypt: bool = False,
         enc_enc: str = "A128GCM",
         enc_alg: str = "RSA-OAEP-256",
-        msg_cls: Optional[MutableMapping] = None,
-        iss2msg_cls: Optional[dict[str, str]] = None,
-        skew: Optional[int] = 15,
-        allowed_sign_algs: Optional[list[str]] = None,
-        allowed_enc_algs: Optional[list[str]] = None,
-        allowed_enc_encs: Optional[list[str]] = None,
-        allowed_max_lifetime: Optional[int] = None,
-        zip: Optional[str] = "",
-        typ2msg_cls: Optional[dict] = None,
+        msg_cls: type[MutableMapping] | None = None,
+        iss2msg_cls: dict[str, str] | None = None,
+        skew: int | None = 15,
+        allowed_sign_algs: list[str] | None = None,
+        allowed_enc_algs: list[str] | None = None,
+        allowed_enc_encs: list[str] | None = None,
+        allowed_max_lifetime: int | None = None,
+        zip: str | None = "",
+        typ2msg_cls: dict | None = None,
     ):
         self.key_jar = key_jar  # KeyJar instance
         self.iss = iss  # My identifier
@@ -209,13 +208,13 @@ def message(self, signing_key, **kwargs):
 
     def pack(
         self,
-        payload: Optional[dict] = None,
-        kid: Optional[str] = "",
-        issuer_id: Optional[str] = "",
-        recv: Optional[str] = "",
-        aud: Optional[str] = None,
-        iat: Optional[int] = None,
-        jws_headers: Optional[dict[str, str]] = None,
+        payload: dict | None = None,
+        kid: str | None = "",
+        issuer_id: str | None = "",
+        recv: str | None = "",
+        aud: str | None = None,
+        iat: int | None = None,
+        jws_headers: dict[str, str] | None = None,
         **kwargs,
     ) -> str:
         """

src/cryptojwt/key_bundle.py

@@ -9,7 +9,6 @@
 import time
 from datetime import datetime
 from functools import cmp_to_key
-from typing import Optional
 
 import requests
 
@@ -808,7 +807,7 @@ def difference(self, bundle):
 
         return [k for k in self.keys() if k not in bundle]
 
-    def dump(self, exclude_attributes: Optional[list[str]] = None):
+    def dump(self, exclude_attributes: list[str] | None = None):
         if exclude_attributes is None:
             exclude_attributes = []
 

src/cryptojwt/key_issuer.py

@@ -1,7 +1,6 @@
 import json
 import logging
 import os
-from typing import Optional
 
 from requests import request
 
@@ -345,7 +344,7 @@ def __len__(self):
             nr += len(kb)
         return nr
 
-    def dump(self, exclude_attributes: Optional[list[str]] = None) -> dict:
+    def dump(self, exclude_attributes: list[str] | None = None) -> dict:
         """
         Returns the content as a dictionary.
 

src/cryptojwt/key_jar.py

@@ -1,7 +1,6 @@
 import contextlib
 import json
 import logging
-from typing import Optional
 
 from requests import request
 
@@ -64,7 +63,7 @@ def _issuer_ids(self) -> list[str]:
         return list(self._issuers.keys())
 
     @deprecated_alias(issuer="issuer_id", owner="issuer_id")
-    def _get_issuer(self, issuer_id: str) -> Optional[KeyIssuer]:
+    def _get_issuer(self, issuer_id: str) -> KeyIssuer | None:
         """
         Return the KeyIssuer instance that has name == issuer_id
 
@@ -623,8 +622,8 @@ def __len__(self):
 
     def _dump_issuers(
         self,
-        exclude_issuers: Optional[list[str]] = None,
-        exclude_attributes: Optional[list[str]] = None,
+        exclude_issuers: list[str] | None = None,
+        exclude_attributes: list[str] | None = None,
     ):
         _issuers = {}
         for _id, _issuer in self._issuers.items():
@@ -635,8 +634,8 @@ def _dump_issuers(
 
     def dump(
         self,
-        exclude_issuers: Optional[list[str]] = None,
-        exclude_attributes: Optional[list[str]] = None,
+        exclude_issuers: list[str] | None = None,
+        exclude_attributes: list[str] | None = None,
     ) -> dict:
         """
         Returns the key jar content as dictionary
@@ -667,7 +666,7 @@ def dump(
 
         return info
 
-    def dumps(self, exclude_issuers: Optional[list[str]] = None):
+    def dumps(self, exclude_issuers: list[str] | None = None):
         """
         Returns a JSON representation of the key jar
 
@@ -680,8 +679,8 @@ def dumps(self, exclude_issuers: Optional[list[str]] = None):
     def load(
         self,
         info: dict,
-        init_args: Optional[dict] = None,
-        load_args: Optional[dict] = None,
+        init_args: dict | None = None,
+        load_args: dict | None = None,
     ):
         """
 

src/cryptojwt/tools/keyconv.py

@@ -6,7 +6,6 @@
 import json
 from binascii import hexlify
 from getpass import getpass
-from typing import Optional
 
 from cryptography.hazmat.primitives import serialization
 
@@ -35,9 +34,9 @@ def jwk_from_file(filename: str, private: bool = True) -> JWK:
 
 def pem2rsa(
     filename: str,
-    kid: Optional[str] = None,
+    kid: str | None = None,
     private: bool = False,
-    passphrase: Optional[str] = None,
+    passphrase: str | None = None,
 ) -> JWK:
     """Convert RSA key from PEM to JWK"""
     if private:
@@ -51,9 +50,9 @@ def pem2rsa(
 
 def pem2ec(
     filename: str,
-    kid: Optional[str] = None,
+    kid: str | None = None,
     private: bool = False,
-    passphrase: Optional[str] = None,
+    passphrase: str | None = None,
 ) -> JWK:
     """Convert EC key from PEM to JWK"""
     if private:
@@ -67,9 +66,9 @@ def pem2ec(
 
 def pem2okp(
     filename: str,
-    kid: Optional[str] = None,
+    kid: str | None = None,
     private: bool = False,
-    passphrase: Optional[str] = None,
+    passphrase: str | None = None,
 ) -> JWK:
     """Convert OKP key from PEM to JWK"""
     if private:
@@ -90,10 +89,10 @@ def bin2jwk(filename: str, kid: str) -> JWK:
 
 def pem2jwk(
     filename: str,
-    kid: Optional[str] = None,
-    kty: Optional[str] = None,
+    kid: str | None = None,
+    kty: str | None = None,
     private: bool = False,
-    passphrase: Optional[str] = None,
+    passphrase: str | None = None,
 ) -> JWK:
     """Read PEM from filename and return JWK"""
     with open(filename) as file:
@@ -144,7 +143,7 @@ def export_jwk(
     jwk: JWK,
     private: bool = False,
     encrypt: bool = False,
-    passphrase: Optional[str] = None,
+    passphrase: str | None = None,
 ) -> bytes:
     """Export JWK as PEM/bin"""
 
@@ -177,7 +176,7 @@ def export_jwk(
     return serialized
 
 
-def output_jwk(jwk: JWK, private: bool = False, filename: Optional[str] = None) -> None:
+def output_jwk(jwk: JWK, private: bool = False, filename: str | None = None) -> None:
     """Output JWK to file"""
     serialized = jwk.serialize(private=private)
     if filename is not None:
@@ -187,7 +186,7 @@ def output_jwk(jwk: JWK, private: bool = False, filename: Optional[str] = None)
         print(json.dumps(serialized, indent=4))
 
 
-def output_bytes(data: bytes, binary: bool = False, filename: Optional[str] = None) -> None:
+def output_bytes(data: bytes, binary: bool = False, filename: str | None = None) -> None:
     """Output data to file"""
     if filename is not None:
         with open(filename, mode="wb") as file: