more lint fixes

Author: jschlyter

.pre-commit-config.yaml

@@ -9,7 +9,7 @@ repos:
       - id: check-yaml
       - id: check-json
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.9
+    rev: v0.6.3
     hooks:
       - id: ruff
       - id: ruff-format

pyproject.toml

@@ -54,7 +54,7 @@ responses = "^0.13.0"
 sphinx = "^3.5.2"
 sphinx-autobuild = "^2021.3.14"
 coverage = "^7"
-ruff = "^0.4.6"
+ruff = "^0.6.3"
 pytest-ruff = "^0.3.2"
 
 [build-system]

src/cryptojwt/jws/jws.py

@@ -60,10 +60,7 @@ def __len__(self):
         return len(self.part)
 
     def valid(self):
-        if len(self) != 3:
-            return False
-
-        return True
+        return len(self) == 3
 
 
 class JWS(JWx):
@@ -153,7 +150,9 @@ 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
 
@@ -193,15 +192,21 @@ def verify_compact_verbose(self, jws=None, keys=None, allow_none=False, sigalg=N
             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
 
@@ -211,7 +216,9 @@ def verify_compact_verbose(self, jws=None, keys=None, allow_none=False, sigalg=N
             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}")
 
@@ -335,7 +342,9 @@ 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
@@ -382,11 +391,10 @@ def _is_json_serialized_jws(self, json_jws):
         """
         json_ser_keys = {"payload", "signatures"}
         flattened_json_ser_keys = {"payload", "signature"}
-        if not json_ser_keys.issubset(json_jws.keys()) and not flattened_json_ser_keys.issubset(
-            json_jws.keys()
-        ):
-            return False
-        return True
+        return not (
+            not json_ser_keys.issubset(json_jws.keys())
+            and not flattened_json_ser_keys.issubset(json_jws.keys())
+        )
 
     def _is_compact_jws(self, jws):
         """

src/cryptojwt/utils.py

@@ -180,7 +180,9 @@ def b64encode_item(item):
     elif isinstance(item, int):
         return b64e(item)
     else:
-        return b64e(json.dumps(bytes2str_conv(item), separators=(",", ":")).encode("utf-8"))
+        return b64e(
+            json.dumps(bytes2str_conv(item), separators=(",", ":")).encode("utf-8")
+        )
 
 
 def split_token(token):
@@ -251,7 +253,9 @@ def rename_kwargs(func_name, kwargs, aliases):
         if alias in kwargs:
             if new in kwargs:
                 raise TypeError(f"{func_name} received both {alias} and {new}")
-            warnings.warn(f"{alias} is deprecated; use {new}", DeprecationWarning, stacklevel=1)
+            warnings.warn(
+                f"{alias} is deprecated; use {new}", DeprecationWarning, stacklevel=1
+            )
             kwargs[new] = kwargs.pop(alias)
 
 
@@ -294,10 +298,7 @@ def is_compact_jws(token):
     except Exception:
         return False
 
-    if "alg" not in _header:
-        return False
-
-    return True
+    return "alg" in _header
 
 
 def is_jwe(token):
@@ -324,10 +325,7 @@ def is_jwe(token):
     except Exception:
         return False
 
-    if "alg" not in _header or "enc" not in _header:
-        return False
-
-    return True
+    return not ("alg" not in _header or "enc" not in _header)
 
 
 def is_json_jws(token):