Maybe I can get isort and black to agree.

Author: rohe

.isort.cfg

@@ -17,8 +17,8 @@ install:
 script:
   - codecov --version
   - tox
-  - isort -sl --check src tests
-  - black --check src tests
+  - isort --check src tests
+  - black -l 100 --check src tests
 after_success:
   - codecov
 notifications:

.travis.yml

@@ -1,6 +1,7 @@
 [isort]
-multi_line_output = 3
+force_single_line = 1
+known_first_party = cryptojwt
 include_trailing_comma = True
 force_grid_wrap = 0
 use_parentheses = True
-line_length = 88
+line_length = 100

setup.cfg

@@ -22,14 +22,7 @@
         "ECDH-ES+A192KW",
         "ECDH-ES+A256KW",
     ],
-    "enc": [
-        "A128CBC-HS256",
-        "A192CBC-HS384",
-        "A256CBC-HS512",
-        "A128GCM",
-        "A192GCM",
-        "A256GCM",
-    ],
+    "enc": ["A128CBC-HS256", "A192CBC-HS384", "A256CBC-HS512", "A128GCM", "A192GCM", "A256GCM",],
 }
 
 

src/cryptojwt/jwe/__init__.py

@@ -55,9 +55,7 @@ def encrypt(self, msg, iv="", auth_data=b""):
 
         hash_key, enc_key, key_len, hash_func = get_keys_seclen_dgst(self.key, iv)
 
-        cipher = Cipher(
-            algorithms.AES(enc_key), modes.CBC(iv), backend=default_backend()
-        )
+        cipher = Cipher(algorithms.AES(enc_key), modes.CBC(iv), backend=default_backend())
         encryptor = cipher.encryptor()
 
         pmsg = self.padder.update(msg)
@@ -80,9 +78,7 @@ def decrypt(self, msg, iv="", auth_data=b"", tag=b"", key=None):
         if comp_tag != tag:
             raise VerificationError("AES-CBC HMAC")
 
-        cipher = Cipher(
-            algorithms.AES(enc_key), modes.CBC(iv), backend=default_backend()
-        )
+        cipher = Cipher(algorithms.AES(enc_key), modes.CBC(iv), backend=default_backend())
         decryptor = cipher.decryptor()
 
         ctext = decryptor.update(msg)

src/cryptojwt/jwe/aes.py

@@ -87,9 +87,7 @@ def enc_setup(self, msg, key=None, auth_data=b"", **kwargs):
         try:
             _epk = kwargs["epk"]
         except KeyError:
-            _epk = ec.generate_private_key(
-                NIST2SEC[as_unicode(key.crv)], default_backend()
-            )
+            _epk = ec.generate_private_key(NIST2SEC[as_unicode(key.crv)], default_backend())
             epk = ECKey().load_key(_epk.public_key())
         else:
             if isinstance(_epk, ec.EllipticCurvePrivateKey):
@@ -116,15 +114,11 @@ def enc_setup(self, msg, key=None, auth_data=b"", **kwargs):
             except KeyError:
                 raise ValueError("Unknown key length for algorithm %s" % self.enc)
 
-            cek = ecdh_derive_key(
-                _epk, key.pub_key, apu, apv, str(self.enc).encode(), dk_len
-            )
+            cek = ecdh_derive_key(_epk, key.pub_key, apu, apv, str(self.enc).encode(), dk_len)
         elif self.alg in ["ECDH-ES+A128KW", "ECDH-ES+A192KW", "ECDH-ES+A256KW"]:
             _pre, _post = self.alg.split("+")
             klen = int(_post[1:4])
-            kek = ecdh_derive_key(
-                _epk, key.pub_key, apu, apv, str(_post).encode(), klen
-            )
+            kek = ecdh_derive_key(_epk, key.pub_key, apu, apv, str(_post).encode(), klen)
             cek = self._generate_key(self.enc, cek=cek)
             encrypted_key = aes_key_wrap(kek, cek, default_backend())
         else:
@@ -163,12 +157,7 @@ def dec_setup(self, token, key=None, **kwargs):
                 raise Exception("Unknown key length for algorithm")
 
             self.cek = ecdh_derive_key(
-                key,
-                epubkey.pub_key,
-                apu,
-                apv,
-                str(self.headers["enc"]).encode(),
-                dk_len,
+                key, epubkey.pub_key, apu, apv, str(self.headers["enc"]).encode(), dk_len,
             )
         elif self.headers["alg"] in [
             "ECDH-ES+A128KW",
@@ -177,9 +166,7 @@ def dec_setup(self, token, key=None, **kwargs):
         ]:
             _pre, _post = self.headers["alg"].split("+")
             klen = int(_post[1:4])
-            kek = ecdh_derive_key(
-                key, epubkey.pub_key, apu, apv, str(_post).encode(), klen
-            )
+            kek = ecdh_derive_key(key, epubkey.pub_key, apu, apv, str(_post).encode(), klen)
             self.cek = aes_key_unwrap(kek, token.encrypted_key(), default_backend())
         else:
             raise Exception("Unsupported algorithm %s" % self.headers["alg"])

src/cryptojwt/jwe/jwe_ec.py

@@ -61,9 +61,7 @@ def encrypt(self, key, iv="", cek="", **kwargs):
 
         _enc = self["enc"]
         _auth_data = jwe.b64_encode_header()
-        ctxt, tag, cek = self.enc_setup(
-            _enc, _msg, auth_data=_auth_data, key=cek, iv=iv
-        )
+        ctxt, tag, cek = self.enc_setup(_enc, _msg, auth_data=_auth_data, key=cek, iv=iv)
         return jwe.pack(parts=[jek, iv, ctxt, tag])
 
     def decrypt(self, token, key=None, cek=None):

src/cryptojwt/jwe/jwe_hmac.py

@@ -81,9 +81,7 @@ def encrypt(self, key, iv="", cek="", **kwargs):
         except KeyError:
             _auth_data = jwe.b64_encode_header()
 
-        ctxt, tag, key = self.enc_setup(
-            _enc, _msg, key=cek, iv=iv, auth_data=_auth_data
-        )
+        ctxt, tag, key = self.enc_setup(_enc, _msg, key=cek, iv=iv, auth_data=_auth_data)
         return jwe.pack(parts=[jwe_enc_key, iv, ctxt, tag])
 
     def decrypt(self, token, key, cek=None):

src/cryptojwt/jwe/jwe_rsa.py

@@ -48,9 +48,7 @@ def is_jwe(self):
         if "alg" in self.headers and "enc" in self.headers:
             for typ in ["alg", "enc"]:
                 if self.headers[typ] not in SUPPORTED[typ]:
-                    logger.debug(
-                        "Not supported %s algorithm: %s" % (typ, self.headers[typ])
-                    )
+                    logger.debug("Not supported %s algorithm: %s" % (typ, self.headers[typ]))
                     return False
         else:
             return False

src/cryptojwt/jwe/jwenc.py

@@ -20,9 +20,7 @@ def encrypt(self, msg, key, sign_padding="pkcs1_padding"):
         return key.encrypt(
             msg,
             _padding(
-                mgf=padding.MGF1(algorithm=_chosen_hash()),
-                algorithm=_chosen_hash(),
-                label=None,
+                mgf=padding.MGF1(algorithm=_chosen_hash()), algorithm=_chosen_hash(), label=None,
             ),
         )