Ran black and isort

Author: rohe

src/cryptojwt/jwe/jwe_ec.py

@@ -213,7 +213,6 @@ def encrypt(self, key=None, iv="", cek="", **kwargs):
         return jwe.pack(parts=[iv, ctxt, tag])
 
     def decrypt(self, token=None, **kwargs):
-
         if isinstance(token, JWEnc):
             jwe = token
         else:

src/cryptojwt/jwk/__init__.py

@@ -31,7 +31,6 @@ class JWK(object):
     def __init__(
         self, kty="", alg="", use="", kid="", x5c=None, x5t="", x5u="", key_ops=None, **kwargs
     ):
-
         self.extra_args = kwargs
 
         # want kty, alg, use and kid to be strings

src/cryptojwt/jwk/okp.py

@@ -321,7 +321,6 @@ def cmp_keys(a, b, key_type):
 
 
 def new_okp_key(crv, kid="", **kwargs):
-
     _key = OKP_CRV2PRIVATE[crv].generate()
 
     _rk = OKPKey(priv_key=_key, kid=kid, **kwargs)

src/cryptojwt/jws/jws.py

@@ -118,7 +118,7 @@ def sign_compact(self, keys=None, protected=None, **kwargs):
 
         key, xargs, _alg = self.alg_keys(keys, "sig", protected)
 
-        for param in ['typ']:
+        for param in ["typ"]:
             if param in self:
                 xargs[param] = self[param]
 

src/cryptojwt/jwt.py

@@ -1,13 +1,13 @@
 """Basic JSON Web Token implementation."""
 import json
-from json import JSONDecodeError
 import logging
 import time
+import uuid
+from json import JSONDecodeError
 from typing import Dict
 from typing import List
 from typing import MutableMapping
 from typing import Optional
-import uuid
 
 from .exception import HeaderError
 from .exception import VerificationError
@@ -81,24 +81,24 @@ class JWT:
     """The basic JSON Web Token class."""
 
     def __init__(
-            self,
-            key_jar=None,
-            iss: str="",
-            lifetime: int = 0,
-            sign: bool = True,
-            sign_alg: str = "RS256",
-            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
+        self,
+        key_jar=None,
+        iss: str = "",
+        lifetime: int = 0,
+        sign: bool = True,
+        sign_alg: str = "RS256",
+        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,
     ):
         self.key_jar = key_jar  # KeyJar instance
         self.iss = iss  # My identifier
@@ -216,15 +216,15 @@ def message(self, signing_key, **kwargs):
         return json.dumps(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,
-            **kwargs
+        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,
+        **kwargs
     ) -> str:
         """
 
@@ -398,8 +398,8 @@ def unpack(self, token, timestamp=None):
             # try to find an issuer specific message class
             if "iss" in _info:
                 _msg_cls = self.iss2msg_cls.get(_info["iss"])
-            if not _msg_cls and _jws_header and 'typ' in _jws_header:
-                _msg_cls = self.typ2msg_cls.get(_jws_header['typ'])
+            if not _msg_cls and _jws_header and "typ" in _jws_header:
+                _msg_cls = self.typ2msg_cls.get(_jws_header["typ"])
 
         timestamp = timestamp or utc_time_sans_frac()
 

src/cryptojwt/jwx.py

@@ -4,14 +4,15 @@
 import warnings
 
 import requests
+
 from cryptojwt.jwk import JWK
 from cryptojwt.key_bundle import KeyBundle
 
 from .exception import HeaderError
 from .jwe import DEPRECATED
 from .jwk.jwk import key_from_jwk_dict
-from .jwk.rsa import import_rsa_key
 from .jwk.rsa import RSAKey
+from .jwk.rsa import import_rsa_key
 from .jwk.x509 import load_x509_cert
 from .utils import as_bytes
 from .utils import as_unicode

src/cryptojwt/key_bundle.py

@@ -566,7 +566,6 @@ def update(self):
         :return: True if update was ok or False if we encountered an error during update.
         """
         if self.source:
-
             try:
                 if self.local:
                     if self.fileformat in ["jwks", "jwk"]:

src/cryptojwt/key_jar.py

@@ -3,9 +3,10 @@
 from typing import List
 from typing import Optional
 
-from cryptojwt.jwk import JWK
 from requests import request
 
+from cryptojwt.jwk import JWK
+
 from .exception import IssuerNotFound
 from .jwe.jwe import alg2keytype as jwe_alg2keytype
 from .jws.utils import alg2keytype as jws_alg2keytype
@@ -481,7 +482,6 @@ def _add_key(
         no_kid_issuer=None,
         allow_missing_kid=False,
     ):
-
         _issuer = self._get_issuer(issuer_id)
         if _issuer is None:
             logger.error('Issuer "{}" not in keyjar'.format(issuer_id))

tests/test_09_jwt.py

@@ -1,14 +1,15 @@
 import os
 
 import pytest
+
 from cryptojwt.jws.exception import NoSuitableSigningKeys
 from cryptojwt.jwt import JWT
+from cryptojwt.jwt import VerificationError
 from cryptojwt.jwt import pick_key
 from cryptojwt.jwt import utc_time_sans_frac
-from cryptojwt.jwt import VerificationError
 from cryptojwt.key_bundle import KeyBundle
-from cryptojwt.key_jar import init_key_jar
 from cryptojwt.key_jar import KeyJar
+from cryptojwt.key_jar import init_key_jar
 
 __author__ = "Roland Hedberg"
 
@@ -240,7 +241,6 @@ def test_with_jti():
 
 
 class DummyMsg(object):
-
     def __init__(self, **kwargs):
         for key, val in kwargs.items():
             setattr(self, key, val)
@@ -309,9 +309,9 @@ def test_eddsa_jwt():
         ]
     }
     JWT_TEST = (
-            "eyJraWQiOiItMTkwOTU3MjI1NyIsImFsZyI6IkVkRFNBIn0."
-            + "eyJqdGkiOiIyMjkxNmYzYy05MDkzLTQ4MTMtODM5Ny1mMTBlNmI3MDRiNjgiLCJkZWxlZ2F0aW9uSWQiOiJiNGFlNDdhNy02MjVhLTQ2MzAtOTcyNy00NTc2NGE3MTJjY2UiLCJleHAiOjE2NTUyNzkxMDksIm5iZiI6MTY1NTI3ODgwOSwic2NvcGUiOiJyZWFkIG9wZW5pZCIsImlzcyI6Imh0dHBzOi8vaWRzdnIuZXhhbXBsZS5jb20iLCJzdWIiOiJ1c2VybmFtZSIsImF1ZCI6ImFwaS5leGFtcGxlLmNvbSIsImlhdCI6MTY1NTI3ODgwOSwicHVycG9zZSI6ImFjY2Vzc190b2tlbiJ9."
-            + "rjeE8D_e4RYzgvpu-nOwwx7PWMiZyDZwkwO6RiHR5t8g4JqqVokUKQt-oST1s45wubacfeDSFogOrIhe3UHDAg"
+        "eyJraWQiOiItMTkwOTU3MjI1NyIsImFsZyI6IkVkRFNBIn0."
+        + "eyJqdGkiOiIyMjkxNmYzYy05MDkzLTQ4MTMtODM5Ny1mMTBlNmI3MDRiNjgiLCJkZWxlZ2F0aW9uSWQiOiJiNGFlNDdhNy02MjVhLTQ2MzAtOTcyNy00NTc2NGE3MTJjY2UiLCJleHAiOjE2NTUyNzkxMDksIm5iZiI6MTY1NTI3ODgwOSwic2NvcGUiOiJyZWFkIG9wZW5pZCIsImlzcyI6Imh0dHBzOi8vaWRzdnIuZXhhbXBsZS5jb20iLCJzdWIiOiJ1c2VybmFtZSIsImF1ZCI6ImFwaS5leGFtcGxlLmNvbSIsImlhdCI6MTY1NTI3ODgwOSwicHVycG9zZSI6ImFjY2Vzc190b2tlbiJ9."
+        + "rjeE8D_e4RYzgvpu-nOwwx7PWMiZyDZwkwO6RiHR5t8g4JqqVokUKQt-oST1s45wubacfeDSFogOrIhe3UHDAg"
     )
     ISSUER = "https://idsvr.example.com"
     kj = KeyJar()
@@ -331,4 +331,4 @@ def test_extra_headers():
     bob = JWT(key_jar=_kj, iss=BOB, sign_alg="HS256", typ2msg_cls={"dummy": DummyMsg})
     info = bob.unpack(_jwt)
     assert isinstance(info, DummyMsg)
-    assert set(info.jws_header.keys()) == {'xtra', 'typ', 'alg', 'kid'}
+    assert set(info.jws_header.keys()) == {"xtra", "typ", "alg", "kid"}