Merge pull request #52 from jschlyter/isort

isort everything

Author: rohe

.travis.yml

@@ -13,7 +13,9 @@ install:
 - pip install codecov
 - pip install tox
 - pip install tox-travis
+- pip install isort
 script:
+- isort --check --recursive src
 - codecov --version
 - tox
 after_success:

setup.cfg

@@ -0,0 +1,6 @@
+[isort]
+multi_line_output = 3
+include_trailing_comma = True
+force_grid_wrap = 0
+use_parentheses = True
+line_length = 88

setup.py

@@ -26,7 +26,7 @@
     version = re.search(r'^__version__\s*=\s*[\'"]([^\'"]*)[\'"]',
                         fd.read(), re.MULTILINE).group(1)
 
-tests_requires = ['responses', 'pytest']
+tests_requires = ['responses', 'pytest', 'isort']
 
 setup(
     name="cryptojwt",

src/cryptojwt/jwk/__init__.py

@@ -4,12 +4,12 @@
 import ssl
 from typing import List
 
-from .utils import DIGEST_HASH
 from ..exception import UnsupportedAlgorithm
 from ..utils import as_bytes
 from ..utils import as_unicode
 from ..utils import b64e
 from ..utils import base64url_to_long
+from .utils import DIGEST_HASH
 
 USE = {
     'sign': 'sig',

src/cryptojwt/jwk/rsa.py

@@ -11,10 +11,10 @@
 from ..exception import JWKESTException
 from ..exception import SerializationNotPossible
 from ..exception import UnsupportedKeyType
+from ..utils import as_unicode
 from ..utils import b64e
 from ..utils import deser
 from ..utils import long_to_base64
-from ..utils import as_unicode
 from . import JWK
 from .asym import AsymmetricKey
 

src/cryptojwt/jws/dsa.py

@@ -1,10 +1,8 @@
 from cryptography.exceptions import InvalidSignature
 from cryptography.hazmat.primitives import hashes
 from cryptography.hazmat.primitives.asymmetric import ec
-from cryptography.hazmat.primitives.asymmetric.utils import \
-    decode_dss_signature
-from cryptography.hazmat.primitives.asymmetric.utils import \
-    encode_dss_signature
+from cryptography.hazmat.primitives.asymmetric.utils import decode_dss_signature
+from cryptography.hazmat.primitives.asymmetric.utils import encode_dss_signature
 from cryptography.utils import int_from_bytes
 from cryptography.utils import int_to_bytes
 

src/cryptojwt/jws/jws.py

@@ -3,14 +3,7 @@
 import logging
 
 from cryptojwt.jws.exception import JWSException
-from .dsa import ECDSASigner
-from .exception import FormatError
-from .exception import NoSuitableSigningKeys
-from .exception import SignerAlgError
-from .hmac import HMACSigner
-from .pss import PSSSigner
-from .rsa import RSASigner
-from .utils import alg2keytype
+
 from ..exception import BadSignature
 from ..exception import UnknownAlgorithm
 from ..exception import WrongNumberOfParts
@@ -20,6 +13,14 @@
 from ..utils import b64d_enc_dec
 from ..utils import b64e_enc_dec
 from ..utils import b64encode_item
+from .dsa import ECDSASigner
+from .exception import FormatError
+from .exception import NoSuitableSigningKeys
+from .exception import SignerAlgError
+from .hmac import HMACSigner
+from .pss import PSSSigner
+from .rsa import RSASigner
+from .utils import alg2keytype
 
 try:
     from builtins import str

src/cryptojwt/jwx.py

@@ -6,6 +6,7 @@
 
 from cryptojwt.jwk import JWK
 from cryptojwt.key_bundle import KeyBundle
+
 from .exception import HeaderError
 from .jwk.jwk import key_from_jwk_dict
 from .jwk.rsa import RSAKey

src/cryptojwt/key_bundle.py

@@ -10,6 +10,7 @@
 
 from cryptojwt.jwk.ec import NIST2SEC
 from cryptojwt.jwk.hmac import new_sym_key
+
 from .exception import JWKException
 from .exception import UnknownKeyType
 from .exception import UnsupportedAlgorithm

src/cryptojwt/key_issuer.py

@@ -8,15 +8,15 @@
 from .jws.utils import alg2keytype as jws_alg2keytype
 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 importer
+from .utils import qualified_name
 
 __author__ = 'Roland Hedberg'
 
-from .key_bundle import key_diff
-from .key_bundle import update_key_bundle
 
-from .utils import importer
 
-from .utils import qualified_name
 
 logger = logging.getLogger(__name__)
 

src/cryptojwt/key_jar.py

@@ -5,7 +5,10 @@
 
 from requests import request
 
-from .exception import UnknownKeyType, KeyIOError, UpdateFailed, IssuerNotFound
+from .exception import IssuerNotFound
+from .exception import KeyIOError
+from .exception import UnknownKeyType
+from .exception import UpdateFailed
 from .jwe.jwe import alg2keytype as jwe_alg2keytype
 from .jws.utils import alg2keytype as jws_alg2keytype
 from .key_bundle import KeyBundle

src/cryptojwt/tools/jwtpeek.py

@@ -7,7 +7,9 @@
 import os
 import sys
 
-from cryptojwt.key_issuer import KeyIssuer
+from pygments import highlight
+from pygments.formatters.terminal import TerminalFormatter
+from pygments.lexers.data import JsonLexer
 
 from cryptojwt.jwe import jwe
 from cryptojwt.jwk.hmac import SYMKey
@@ -16,10 +18,8 @@
 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
 from cryptojwt.key_jar import KeyJar
-from pygments import highlight
-from pygments.formatters.terminal import TerminalFormatter
-from pygments.lexers.data import JsonLexer
 
 __author__ = 'roland'
 

src/cryptojwt/tools/keyconv.py

@@ -9,6 +9,7 @@
 from typing import Optional
 
 from cryptography.hazmat.primitives import serialization
+
 from cryptojwt.jwk import JWK
 from cryptojwt.jwk.ec import ECKey
 from cryptojwt.jwk.ec import import_private_key_from_file

src/cryptojwt/utils.py

@@ -10,7 +10,6 @@
 
 from cryptojwt.exception import BadSyntax
 
-
 # ---------------------------------------------------------------------------
 # Helper functions
 

tests/invalid_ecdh.py

@@ -1,4 +1,5 @@
 import pytest
+
 from cryptojwt.jwe import JWE_EC
 from cryptojwt.jwe import factory
 from cryptojwt.jwk import ECKey

tests/test_02_jwk.py

@@ -21,8 +21,8 @@
 from cryptojwt.jwk import certificate_fingerprint
 from cryptojwt.jwk import pem_hash
 from cryptojwt.jwk import pems_to_x5c
-from cryptojwt.jwk.ec import ECKey
 from cryptojwt.jwk.ec import NIST2SEC
+from cryptojwt.jwk.ec import ECKey
 from cryptojwt.jwk.hmac import SYMKey
 from cryptojwt.jwk.hmac import new_sym_key
 from cryptojwt.jwk.hmac import sha256_digest

tests/test_04_key_jar.py

@@ -5,7 +5,8 @@
 
 import pytest
 
-from cryptojwt.exception import JWKESTException, IssuerNotFound
+from cryptojwt.exception import IssuerNotFound
+from cryptojwt.exception import JWKESTException
 from cryptojwt.jwe.jwenc import JWEnc
 from cryptojwt.jws.jws import JWS
 from cryptojwt.jws.jws import factory
@@ -15,10 +16,10 @@
 from cryptojwt.key_jar import KeyJar
 from cryptojwt.key_jar import build_keyjar
 from cryptojwt.key_jar import init_key_jar
+from cryptojwt.key_jar import rotate_keys
 
 __author__ = 'Roland Hedberg'
 
-from cryptojwt.key_jar import rotate_keys
 
 BASE_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__),
                                          "test_keys"))

tests/test_05_jwx.py

@@ -2,6 +2,7 @@
 import os
 
 import pytest
+
 from cryptojwt.jwk.rsa import RSAKey
 from cryptojwt.jwx import JWx
 

tests/test_06_jws.py

@@ -18,8 +18,8 @@
 from cryptojwt.jws.exception import NoSuitableSigningKeys
 from cryptojwt.jws.exception import SignerAlgError
 from cryptojwt.jws.jws import JWS
-from cryptojwt.jws.jws import JWSig
 from cryptojwt.jws.jws import SIGNER_ALGS
+from cryptojwt.jws.jws import JWSig
 from cryptojwt.jws.jws import factory
 from cryptojwt.jws.rsa import RSASigner
 from cryptojwt.jws.utils import left_hash

tests/test_07_jwe.py

@@ -8,6 +8,7 @@
 import pytest
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives.asymmetric import ec
+
 from cryptojwt.exception import BadSyntax
 from cryptojwt.exception import HeaderError
 from cryptojwt.exception import MissingKey

tests/test_09_jwt.py

@@ -2,7 +2,8 @@
 
 import pytest
 
-from cryptojwt.exception import JWKESTException, IssuerNotFound
+from cryptojwt.exception import IssuerNotFound
+from cryptojwt.exception import JWKESTException
 from cryptojwt.jws.exception import NoSuitableSigningKeys
 from cryptojwt.jwt import JWT
 from cryptojwt.jwt import pick_key

tests/test_10_jwk_wrap.py

@@ -3,7 +3,8 @@
 from cryptojwt.jwk.ec import new_ec_key
 from cryptojwt.jwk.hmac import SYMKey
 from cryptojwt.jwk.rsa import new_rsa_key
-from cryptojwt.jwk.wrap import wrap_key, unwrap_key
+from cryptojwt.jwk.wrap import unwrap_key
+from cryptojwt.jwk.wrap import wrap_key
 
 __author__ = 'jschlyter'
 

tests/test_20_jws.py

@@ -3,6 +3,7 @@
 
 import pytest
 import test_vector
+
 from cryptojwt import utils
 from cryptojwt.exception import JWKESTException
 from cryptojwt.jwk.jwk import key_from_jwk_dict