more lint and fix format (respect black/isort)

Author: jschlyter

.pre-commit-config.yaml

@@ -12,4 +12,4 @@ repos:
     rev: v0.6.3
     hooks:
       - id: ruff
-      - id: ruff-format
+      #- id: ruff-format

pyproject.toml

@@ -61,6 +61,9 @@ pytest-ruff = "^0.3.2"
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"
 
+[tool.ruff]
+line-length = 100
+
 [tool.ruff.lint]
 select = [
     # pycodestyle
@@ -78,3 +81,9 @@ select = [
 ]
 ignore = ["E501", "I001", "SIM102"]
 exclude = ["examples/*"]
+
+[tool.ruff.lint.isort]
+force-sort-within-sections = false
+combine-as-imports = true
+split-on-trailing-comma = false
+known-first-party = ["cryptojwt"]

src/cryptojwt/jwe/jwe.py

@@ -171,11 +171,7 @@ def decrypt(self, token=None, keys=None, alg=None, cek=None):
         elif _alg.startswith("ECDH-ES"):
             decrypter = JWE_EC(**self._dict)
 
-            _key = (
-                keys[0].private_key()
-                if isinstance(keys[0], AsymmetricKey)
-                else keys[0].key
-            )
+            _key = keys[0].private_key() if isinstance(keys[0], AsymmetricKey) else keys[0].key
 
             cek = decrypter.dec_setup(_jwe, key=_key)
         else:

src/cryptojwt/jwk/__init__.py

@@ -236,11 +236,7 @@ def __eq__(self, other):
         if set(self.__dict__.keys()) != set(other.__dict__.keys()):
             return False
 
-        for key in self.public_members:
-            if getattr(other, key) != getattr(self, key):
-                return False
-
-        return True
+        return all(getattr(other, key) == getattr(self, key) for key in self.public_members)
 
     def keys(self):
         return list(self.to_dict().keys())

src/cryptojwt/jwk/asym.py

@@ -19,7 +19,7 @@ def __init__(
         k="",
         pub_key=None,
         priv_key=None,
-        **kwargs
+        **kwargs,
     ):
         JWK.__init__(self, kty, alg, use, kid, x5c, x5t, x5u, **kwargs)
         self.k = k

src/cryptojwt/jwk/rsa.py

@@ -254,7 +254,7 @@ def __init__(
         dq="",
         di="",
         qi="",
-        **kwargs
+        **kwargs,
     ):
         AsymmetricKey.__init__(self, kty, alg, use, kid, x5c, x5t, x5u, **kwargs)
         self.n = n
@@ -322,10 +322,7 @@ def deserialize(self):
                 _cert_chain.append(der_cert(base64.b64decode(der_data)))
 
             if self.x5t:  # verify the cert thumbprint
-                if isinstance(self.x5t, bytes):
-                    _x5t = self.x5t
-                else:
-                    _x5t = self.x5t.encode("ascii")
+                _x5t = self.x5t if isinstance(self.x5t, bytes) else self.x5t.encode("ascii")
                 if _x5t != x5t_calculation(self.x5c[0]):
                     raise DeSerializationNotPossible(
                         "The thumbprint 'x5t' does not match the certificate."

src/cryptojwt/jws/jws.py

@@ -150,9 +150,7 @@ def verify_compact(self, jws=None, keys=None, allow_none=False, sigalg=None):
         """
         return self.verify_compact_verbose(jws, keys, allow_none, sigalg)["msg"]
 
-    def verify_compact_verbose(
-        self, jws=None, keys=None, allow_none=False, sigalg=None
-    ):
+    def verify_compact_verbose(self, jws=None, keys=None, allow_none=False, sigalg=None):
         """
         Verify a JWT signature and return dict with validation results
 
@@ -192,21 +190,15 @@ def verify_compact_verbose(
             if isinstance(self["alg"], list):
                 if _alg not in self["alg"]:
                     raise SignerAlgError(
-                        "Wrong signing algorithm, expected {} got {}".format(
-                            self["alg"], _alg
-                        )
+                        "Wrong signing algorithm, expected {} got {}".format(self["alg"], _alg)
                     )
             elif _alg != self["alg"]:
                 raise SignerAlgError(
-                    "Wrong signing algorithm, expected {} got {}".format(
-                        self["alg"], _alg
-                    )
+                    "Wrong signing algorithm, expected {} got {}".format(self["alg"], _alg)
                 )
 
         if sigalg and sigalg != _alg:
-            raise SignerAlgError(
-                "Expected {} got {}".format(sigalg, jwt.headers["alg"])
-            )
+            raise SignerAlgError("Expected {} got {}".format(sigalg, jwt.headers["alg"]))
 
         self["alg"] = _alg
 
@@ -216,9 +208,7 @@ def verify_compact_verbose(
             if "kid" in self:
                 raise NoSuitableSigningKeys("No key with kid: {}".format(self["kid"]))
             elif "kid" in self.jwt.headers:
-                raise NoSuitableSigningKeys(
-                    "No key with kid: {}".format(self.jwt.headers["kid"])
-                )
+                raise NoSuitableSigningKeys("No key with kid: {}".format(self.jwt.headers["kid"]))
             else:
                 raise NoSuitableSigningKeys(f"No key for algorithm: {_alg}")
 
@@ -342,9 +332,7 @@ def verify_json(self, jws, keys=None, allow_none=False, at_least_one=False):
                 _tmp = self.verify_compact(token, keys, allow_none)
             except NoSuitableSigningKeys:
                 if at_least_one is True:
-                    logger.warning(
-                        f"Could not verify signature with headers: {all_headers}"
-                    )
+                    logger.warning(f"Could not verify signature with headers: {all_headers}")
                     continue
                 else:
                     raise

src/cryptojwt/key_issuer.py

@@ -286,10 +286,7 @@ def get(self, key_use, key_type="", kid=None, alg="", **kwargs):
 
         if not key_type:
             if alg:
-                if use == "sig":
-                    key_type = jws_alg2keytype(alg)
-                else:
-                    key_type = jwe_alg2keytype(alg)
+                key_type = jws_alg2keytype(alg) if use == "sig" else jwe_alg2keytype(alg)
 
         lst = []
         for bundle in self._bundles:

src/cryptojwt/key_jar.py

@@ -233,10 +233,7 @@ def keys_by_alg_and_usage(self, issuer_id, alg, usage):
         :param usage: What the key should be used for
         :return: A possibly empty list of keys
         """
-        if usage in ["sig", "ver"]:
-            ktype = jws_alg2keytype(alg)
-        else:
-            ktype = jwe_alg2keytype(alg)
+        ktype = jws_alg2keytype(alg) if usage in ["sig", "ver"] else jwe_alg2keytype(alg)
 
         return self.get(usage, ktype, issuer_id)
 

src/cryptojwt/tools/keyconv.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 
 """Convert JWK from/to PEM and other formats"""
+
 import argparse
 import json
 from binascii import hexlify