lint

Author: jschlyter

src/cryptojwt/jwe/jwe.py

@@ -1,3 +1,4 @@
+import contextlib
 import logging
 
 from ..jwk.asym import AsymmetricKey
@@ -157,10 +158,8 @@ def decrypt(self, token=None, keys=None, alg=None, cek=None):
         else:
             keys = self.pick_keys(self._get_keys(), use="enc", alg=_alg)
 
-        try:
+        with contextlib.suppress(KeyError):
             keys.append(key_from_jwk_dict(_jwe.headers["jwk"]))
-        except KeyError:
-            pass
 
         if not keys and not cek:
             raise NoSuitableDecryptionKey(_alg)

src/cryptojwt/jwe/jwe_ec.py

@@ -1,3 +1,4 @@
+import contextlib
 import struct
 
 from cryptography.hazmat.primitives.asymmetric import ec
@@ -190,10 +191,8 @@ def encrypt(self, key=None, iv="", cek="", **kwargs):
         _msg = as_bytes(self.msg)
 
         _args = self._dict
-        try:
+        with contextlib.suppress(KeyError):
             _args["kid"] = kwargs["kid"]
-        except KeyError:
-            pass
 
         if "params" in kwargs:
             if "apu" in kwargs["params"]:

src/cryptojwt/jwe/jwe_hmac.py

@@ -1,3 +1,4 @@
+import contextlib
 import logging
 import zlib
 
@@ -34,10 +35,8 @@ def encrypt(self, key, iv="", cek="", **kwargs):
         _msg = as_bytes(self.msg)
 
         _args = self._dict
-        try:
+        with contextlib.suppress(KeyError):
             _args["kid"] = kwargs["kid"]
-        except KeyError:
-            pass
 
         jwe = JWEnc(**_args)
 

src/cryptojwt/jwt.py

@@ -1,5 +1,6 @@
 """Basic JSON Web Token implementation."""
 
+import contextlib
 import json
 import logging
 import time
@@ -143,10 +144,8 @@ def receivers(self):
     def my_keys(self, issuer_id="", use="sig"):
         _k = self.key_jar.get(use, issuer_id=issuer_id)
         if issuer_id != "":
-            try:
+            with contextlib.suppress(KeyError):
                 _k.extend(self.key_jar.get(use, issuer_id=""))
-            except KeyError:
-                pass
         return _k
 
     def _encrypt(self, payload, recv, cty="JWT", zip=""):
@@ -442,9 +441,7 @@ def remove_jwt_parameters(arg):
     """
 
     for param in JWT.jwt_parameters:
-        try:
+        with contextlib.suppress(KeyError):
             del arg[param]
-        except KeyError:
-            pass
 
     return arg

src/cryptojwt/key_bundle.py

@@ -1,5 +1,6 @@
 """Implementation of a Key Bundle."""
 
+import contextlib
 import copy
 import json
 import logging
@@ -8,7 +9,8 @@
 import time
 from datetime import datetime
 from functools import cmp_to_key
-from typing import List, Optional
+from typing import List
+from typing import Optional
 
 import requests
 
@@ -17,19 +19,23 @@
 from cryptojwt.jwk.okp import OKP_CRV2PUBLIC
 from cryptojwt.jwk.x509 import import_private_key_from_pem_file
 
-from .exception import (
-    JWKException,
-    UnknownKeyType,
-    UnsupportedAlgorithm,
-    UnsupportedECurve,
-    UpdateFailed,
-)
-from .jwk.ec import ECKey, new_ec_key
+from .exception import JWKException
+from .exception import UnknownKeyType
+from .exception import UnsupportedAlgorithm
+from .exception import UnsupportedECurve
+from .exception import UpdateFailed
+from .jwk.ec import ECKey
+from .jwk.ec import new_ec_key
 from .jwk.hmac import SYMKey
-from .jwk.jwk import dump_jwk, import_jwk
-from .jwk.okp import OKPKey, new_okp_key
-from .jwk.rsa import RSAKey, new_rsa_key
-from .utils import as_unicode, check_content_type, httpc_params_loader
+from .jwk.jwk import dump_jwk
+from .jwk.jwk import import_jwk
+from .jwk.okp import OKPKey
+from .jwk.okp import new_okp_key
+from .jwk.rsa import RSAKey
+from .jwk.rsa import new_rsa_key
+from .utils import as_unicode
+from .utils import check_content_type
+from .utils import httpc_params_loader
 
 __author__ = "Roland Hedberg"
 
@@ -685,10 +691,8 @@ def remove(self, key):
 
         :param key: The key that should be removed
         """
-        try:
+        with contextlib.suppress(ValueError):
             self._keys.remove(key)
-        except ValueError:
-            pass
 
     def __len__(self):
         """

src/cryptojwt/key_issuer.py

@@ -1,14 +1,20 @@
 import json
 import logging
 import os
-from typing import List, Optional
+from typing import List
+from typing import Optional
 
 from requests import request
 
 from .jwe.utils import alg2keytype as jwe_alg2keytype
 from .jws.utils import alg2keytype as jws_alg2keytype
-from .key_bundle import KeyBundle, build_key_bundle, key_diff, update_key_bundle
-from .utils import httpc_params_loader, importer, qualified_name
+from .key_bundle import KeyBundle
+from .key_bundle import build_key_bundle
+from .key_bundle import key_diff
+from .key_bundle import update_key_bundle
+from .utils import httpc_params_loader
+from .utils import importer
+from .utils import qualified_name
 
 __author__ = "Roland Hedberg"
 

src/cryptojwt/key_jar.py

@@ -1,3 +1,4 @@
+import contextlib
 import json
 import logging
 from typing import List
@@ -669,10 +670,8 @@ def dump(
 
         if exclude_attributes:
             for attr in exclude_attributes:
-                try:
+                with contextlib.suppress(KeyError):
                     del info[attr]
-                except KeyError:
-                    pass
 
         if exclude_attributes is None or "issuers" not in exclude_attributes:
             info["issuers"] = self._dump_issuers(

src/cryptojwt/simple_jwt.py

@@ -1,3 +1,4 @@
+import contextlib
 import json
 import logging
 
@@ -36,10 +37,8 @@ def unpack(self, token, **kwargs):
             against.
         """
         if isinstance(token, str):
-            try:
+            with contextlib.suppress(UnicodeDecodeError):
                 token = token.encode("utf-8")
-            except UnicodeDecodeError:
-                pass
 
         part = split_token(token)
         self.b64part = part
@@ -98,10 +97,8 @@ def payload(self):
         if "cty" in self.headers and self.headers["cty"].lower() != "jwt":
             pass
         else:
-            try:
+            with contextlib.suppress(ValueError):
                 _msg = json.loads(_msg)
-            except ValueError:
-                pass
 
         return _msg
 

src/cryptojwt/tools/jwtpeek.py

@@ -13,7 +13,8 @@
 from cryptojwt.jwe import jwe
 from cryptojwt.jwk.hmac import SYMKey
 from cryptojwt.jwk.jwk import key_from_jwk_dict
-from cryptojwt.jwk.rsa import RSAKey, import_rsa_key
+from cryptojwt.jwk.rsa import RSAKey
+from cryptojwt.jwk.rsa import import_rsa_key
 from cryptojwt.jws import jws
 from cryptojwt.key_bundle import KeyBundle
 from cryptojwt.key_issuer import KeyIssuer

src/cryptojwt/utils.py

@@ -1,4 +1,5 @@
 import base64
+import contextlib
 import functools
 import importlib
 import json
@@ -140,10 +141,8 @@ def as_bytes(s):
     :param s: Unicode / bytes string
     :return: bytes string
     """
-    try:
+    with contextlib.suppress(AttributeError, UnicodeDecodeError):
         s = s.encode()
-    except (AttributeError, UnicodeDecodeError):
-        pass
     return s
 
 
@@ -154,10 +153,8 @@ def as_unicode(b):
     :param b: byte string
     :return: unicode string
     """
-    try:
+    with contextlib.suppress(AttributeError, UnicodeDecodeError):
         b = b.decode()
-    except (AttributeError, UnicodeDecodeError):
-        pass
     return b