Fix UP035

Author: jschlyter

pyproject.toml

@@ -74,7 +74,7 @@ select = [
     # isort
     "I",
 ]
-ignore = ["E501", "I001", "SIM102", "UP006", "UP035"]
+ignore = ["E501", "I001", "SIM102", "UP006"]
 exclude = ["examples/*"]
 
 [tool.ruff.lint.isort]

src/cryptojwt/__init__.py

@@ -1,7 +1,7 @@
 """JSON Web Token"""
 
 import logging
-from importlib.metadata import version, PackageNotFoundError
+from importlib.metadata import PackageNotFoundError, version
 
 from cryptojwt.jwe.jwe import JWE
 from cryptojwt.jwk import JWK

src/cryptojwt/jwk/__init__.py

@@ -2,7 +2,6 @@
 import hashlib
 import json
 import ssl
-from typing import List
 
 from ..exception import UnsupportedAlgorithm
 from ..utils import as_bytes, as_unicode, b64e, base64url_to_long
@@ -21,12 +20,21 @@ class JWK:
     """
 
     members = ["kty", "alg", "use", "kid", "x5c", "x5t", "x5u", "key_ops"]
-    longs: List[str] = []
+    longs: list[str] = []
     public_members = ["kty", "alg", "use", "kid", "x5c", "x5t", "x5u", "key_ops"]
     required = ["kty"]
 
     def __init__(
-        self, kty="", alg="", use="", kid="", x5c=None, x5t="", x5u="", key_ops=None, **kwargs
+        self,
+        kty="",
+        alg="",
+        use="",
+        kid="",
+        x5c=None,
+        x5t="",
+        x5u="",
+        key_ops=None,
+        **kwargs,
     ):
         self.extra_args = kwargs
 
@@ -121,7 +129,7 @@ def __init__(
             self.kid = as_unicode(kid)
 
         if key_ops:
-            self.key_ops: List[str] = []
+            self.key_ops: list[str] = []
             for ops in key_ops:
                 if isinstance(ops, str):
                     self.key_ops.append(ops)

src/cryptojwt/jwt.py

@@ -5,8 +5,9 @@
 import logging
 import time
 import uuid
+from collections.abc import MutableMapping
 from json import JSONDecodeError
-from typing import Dict, List, MutableMapping, Optional
+from typing import Optional
 
 from .exception import HeaderError, VerificationError
 from .jwe.jwe import JWE, factory as jwe_factory
@@ -84,14 +85,14 @@ def __init__(
         enc_enc: str = "A128GCM",
         enc_alg: str = "RSA-OAEP-256",
         msg_cls: Optional[MutableMapping] = None,
-        iss2msg_cls: Optional[Dict[str, str]] = 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_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,
+        typ2msg_cls: Optional[dict] = None,
     ):
         self.key_jar = key_jar  # KeyJar instance
         self.iss = iss  # My identifier
@@ -214,7 +215,7 @@ def pack(
         recv: Optional[str] = "",
         aud: Optional[str] = None,
         iat: Optional[int] = None,
-        jws_headers: Optional[Dict[str, str]] = None,
+        jws_headers: Optional[dict[str, str]] = None,
         **kwargs,
     ) -> str:
         """

src/cryptojwt/key_bundle.py

@@ -9,7 +9,7 @@
 import time
 from datetime import datetime
 from functools import cmp_to_key
-from typing import List, Optional
+from typing import Optional
 
 import requests
 
@@ -808,7 +808,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: Optional[list[str]] = None):
         if exclude_attributes is None:
             exclude_attributes = []
 

src/cryptojwt/key_issuer.py

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

src/cryptojwt/key_jar.py

@@ -1,7 +1,7 @@
 import contextlib
 import json
 import logging
-from typing import List, Optional
+from typing import Optional
 
 from requests import request
 
@@ -55,7 +55,7 @@ def __init__(
         if not self.httpc_params:  # backward compatibility
             self.httpc_params["verify"] = verify_ssl
 
-    def _issuer_ids(self) -> List[str]:
+    def _issuer_ids(self) -> list[str]:
         """
         Returns a list of issuer identifiers
 
@@ -159,7 +159,7 @@ def add_kb(self, issuer_id, kb):
         issuer.add_kb(kb)
         self._issuers[issuer_id] = issuer
 
-    def add_keys(self, issuer_id: str, keys: List[JWK], **kwargs):
+    def add_keys(self, issuer_id: str, keys: list[JWK], **kwargs):
         _kb = KeyBundle(**kwargs)
         _kb.extend(keys)
         self.add_kb(issuer_id, _kb)
@@ -623,8 +623,8 @@ def __len__(self):
 
     def _dump_issuers(
         self,
-        exclude_issuers: Optional[List[str]] = None,
-        exclude_attributes: Optional[List[str]] = None,
+        exclude_issuers: Optional[list[str]] = None,
+        exclude_attributes: Optional[list[str]] = None,
     ):
         _issuers = {}
         for _id, _issuer in self._issuers.items():
@@ -635,8 +635,8 @@ def _dump_issuers(
 
     def dump(
         self,
-        exclude_issuers: Optional[List[str]] = None,
-        exclude_attributes: Optional[List[str]] = None,
+        exclude_issuers: Optional[list[str]] = None,
+        exclude_attributes: Optional[list[str]] = None,
     ) -> dict:
         """
         Returns the key jar content as dictionary
@@ -667,7 +667,7 @@ def dump(
 
         return info
 
-    def dumps(self, exclude_issuers: Optional[List[str]] = None):
+    def dumps(self, exclude_issuers: Optional[list[str]] = None):
         """
         Returns a JSON representation of the key jar
 

src/cryptojwt/utils.py

@@ -8,7 +8,6 @@
 import warnings
 from binascii import unhexlify
 from email.message import EmailMessage
-from typing import List, Set, Union
 
 from cryptojwt.exception import BadSyntax
 
@@ -32,7 +31,7 @@ def intarr2str(arr):
 
 
 def long2intarr(long_int):
-    _bytes: List[int] = []
+    _bytes: list[int] = []
     while long_int:
         long_int, r = divmod(long_int, 256)
         _bytes.insert(0, r)
@@ -262,7 +261,7 @@ def httpc_params_loader(httpc_params):
     return httpc_params
 
 
-def check_content_type(content_type: str, mime_type: Union[str, List[str], Set[str]]):
+def check_content_type(content_type: str, mime_type: str | list[str] | set[str]):
     """Return True if the content type contains the MIME type"""
     msg = EmailMessage()
     msg["content-type"] = content_type

tests/test_21_pss.py

@@ -1,10 +1,10 @@
 import json
 
 import pytest
+import test_vector
 
 from cryptojwt.jwk.jwk import key_from_jwk_dict
 from cryptojwt.jws.jws import JWS
-import test_vector
 
 
 @pytest.mark.parametrize("alg", ["RS256", "RS384", "RS512", "PS256", "PS384", "PS512"])