Merge branch 'develop' into x509_symmetry

Author: jschlyter

.isort.cfg

@@ -12,12 +12,10 @@ addons:
       -
 install:
   - pip install codecov
-  - pip install tox
-  - pip install tox-travis
-  - pip install "isort>=5.0.2"
-  - pip install black
+  - pip install tox tox-travis
+  - pip install isort black
 script:
-  - isort --check --recursive src tests
+  - isort --check src tests
   - black --check src tests
   - codecov --version
   - tox

.travis.yml

@@ -26,7 +26,7 @@
     version = re.search(r'^__version__\s*=\s*[\'"]([^\'"]*)[\'"]',
                         fd.read(), re.MULTILINE).group(1)
 
-tests_requires = ['responses', 'pytest', 'isort', 'black']
+tests_requires = ['responses', 'pytest', 'isort>=5.0.2', 'black']
 
 setup(
     name="cryptojwt",
@@ -53,7 +53,7 @@
     extras_require={
         'testing': tests_requires,
         'docs': ['Sphinx', 'sphinx-autobuild', 'alabaster'],
-        'quality': ['isort'],
+        'quality': ['isort>=5.0.2', 'black'],
     },
     scripts=glob.glob('script/*.py'),
     entry_points={

setup.py

@@ -9,15 +9,10 @@
 from cryptojwt.key_jar import KeyJar
 
 from .exception import BadSyntax
-from .utils import as_unicode
-from .utils import b64d
-from .utils import b64encode_item
-from .utils import split_token
+from .utils import as_unicode, b64d, b64encode_item, split_token
 
 try:
-    from builtins import zip
-    from builtins import hex
-    from builtins import str
+    from builtins import hex, str, zip
 except ImportError:
     pass
 

src/cryptojwt/__init__.py

@@ -3,15 +3,11 @@
 
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives import hmac
-from cryptography.hazmat.primitives.ciphers import Cipher
-from cryptography.hazmat.primitives.ciphers import algorithms
-from cryptography.hazmat.primitives.ciphers import modes
+from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
 from cryptography.hazmat.primitives.ciphers.aead import AESGCM
 from cryptography.hazmat.primitives.padding import PKCS7
 
-from ..exception import MissingKey
-from ..exception import Unsupported
-from ..exception import VerificationError
+from ..exception import MissingKey, Unsupported, VerificationError
 from . import Encrypter
 from .exception import UnsupportedBitLength
 from .utils import get_keys_seclen_dgst

src/cryptojwt/jwe/aes.py

@@ -6,12 +6,14 @@
 from ..jwk.jwk import key_from_jwk_dict
 from ..jwk.rsa import RSAKey
 from ..jwx import JWx
-from .exception import DecryptionFailed
-from .exception import NoSuitableDecryptionKey
-from .exception import NoSuitableECDHKey
-from .exception import NoSuitableEncryptionKey
-from .exception import NotSupportedAlgorithm
-from .exception import WrongEncryptionAlgorithm
+from .exception import (
+    DecryptionFailed,
+    NoSuitableDecryptionKey,
+    NoSuitableECDHKey,
+    NoSuitableEncryptionKey,
+    NotSupportedAlgorithm,
+    WrongEncryptionAlgorithm,
+)
 from .jwe_ec import JWE_EC
 from .jwe_hmac import JWE_SYM
 from .jwe_rsa import JWE_RSA

src/cryptojwt/jwe/jwe.py

@@ -2,20 +2,14 @@
 
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives.asymmetric import ec
-from cryptography.hazmat.primitives.keywrap import aes_key_unwrap
-from cryptography.hazmat.primitives.keywrap import aes_key_wrap
-
-from ..jwk.ec import NIST2SEC
-from ..jwk.ec import ECKey
-from ..utils import as_bytes
-from ..utils import as_unicode
-from ..utils import b64d
-from ..utils import b64e
+from cryptography.hazmat.primitives.keywrap import aes_key_unwrap, aes_key_wrap
+
+from ..jwk.ec import NIST2SEC, ECKey
+from ..utils import as_bytes, as_unicode, b64d, b64e
 from . import KEY_LEN
 from .jwekey import JWEKey
 from .jwenc import JWEnc
-from .utils import concat_sha256
-from .utils import get_random_bytes
+from .utils import concat_sha256, get_random_bytes
 
 
 def ecdh_derive_key(key, epk, apu, apv, alg, dk_len):

src/cryptojwt/jwe/jwe_ec.py

@@ -2,14 +2,11 @@
 import zlib
 
 from cryptography.hazmat.backends import default_backend
-from cryptography.hazmat.primitives.keywrap import aes_key_unwrap
-from cryptography.hazmat.primitives.keywrap import aes_key_wrap
+from cryptography.hazmat.primitives.keywrap import aes_key_unwrap, aes_key_wrap
 
-from ..exception import MissingKey
-from ..exception import WrongNumberOfParts
+from ..exception import MissingKey, WrongNumberOfParts
 from ..jwk.hmac import SYMKey
-from ..utils import as_bytes
-from ..utils import intarr2str
+from ..utils import as_bytes, intarr2str
 from .jwekey import JWEKey
 from .jwenc import JWEnc
 

src/cryptojwt/jwe/jwe_hmac.py

@@ -3,8 +3,7 @@
 
 from ..utils import as_bytes
 from . import SUPPORTED
-from .exception import NotSupportedAlgorithm
-from .exception import ParameterError
+from .exception import NotSupportedAlgorithm, ParameterError
 from .jwekey import JWEKey
 from .jwenc import JWEnc
 from .rsa import RSAEncrypter

src/cryptojwt/jwe/jwe_rsa.py

@@ -1,12 +1,8 @@
 from ..jwx import JWx
 from . import KEY_LEN_BYTES
-from .aes import AES_CBCEncrypter
-from .aes import AES_GCMEncrypter
-from .exception import DecryptionFailed
-from .exception import NotSupportedAlgorithm
-from .utils import alg2keytype
-from .utils import get_random_bytes
-from .utils import split_ctx_and_tag
+from .aes import AES_CBCEncrypter, AES_GCMEncrypter
+from .exception import DecryptionFailed, NotSupportedAlgorithm
+from .utils import alg2keytype, get_random_bytes, split_ctx_and_tag
 
 
 class JWEKey(JWx):