Skip to content

Commit a243611

Browse files
jschlyterjschlyter
committed
more isort
1 parent a87360d commit a243611

14 files changed

+86
-123
lines changed

‎.isort.cfg

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎tests/invalid_ecdh.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import pytest
22

3-
from cryptojwt.jwe import JWE_EC
4-
from cryptojwt.jwe import factory
3+
from cryptojwt.jwe import JWE_EC, factory
54
from cryptojwt.jwk import ECKey
65

76
JWK = {

‎tests/test_02_jwk.py

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/usr/bin/env python3
2-
32
from __future__ import print_function
43

54
import base64
@@ -13,34 +12,36 @@
1312
from cryptography.hazmat.primitives.asymmetric import rsa
1413
from cryptography.hazmat.primitives.asymmetric.ec import generate_private_key
1514

16-
from cryptojwt.exception import DeSerializationNotPossible
17-
from cryptojwt.exception import UnsupportedAlgorithm
18-
from cryptojwt.exception import WrongUsage
19-
from cryptojwt.jwk import JWK
20-
from cryptojwt.jwk import calculate_x5t
21-
from cryptojwt.jwk import certificate_fingerprint
22-
from cryptojwt.jwk import pem_hash
23-
from cryptojwt.jwk import pems_to_x5c
24-
from cryptojwt.jwk.ec import NIST2SEC
25-
from cryptojwt.jwk.ec import ECKey
26-
from cryptojwt.jwk.hmac import SYMKey
27-
from cryptojwt.jwk.hmac import new_sym_key
28-
from cryptojwt.jwk.hmac import sha256_digest
29-
from cryptojwt.jwk.jwk import dump_jwk
30-
from cryptojwt.jwk.jwk import import_jwk
31-
from cryptojwt.jwk.jwk import jwk_wrap
32-
from cryptojwt.jwk.jwk import key_from_jwk_dict
33-
from cryptojwt.jwk.rsa import RSAKey
34-
from cryptojwt.jwk.rsa import import_private_rsa_key_from_file
35-
from cryptojwt.jwk.rsa import import_public_rsa_key_from_file
36-
from cryptojwt.jwk.rsa import import_rsa_key_from_cert_file
37-
from cryptojwt.jwk.rsa import new_rsa_key
38-
from cryptojwt.utils import as_bytes
39-
from cryptojwt.utils import as_unicode
40-
from cryptojwt.utils import b64e
41-
from cryptojwt.utils import base64_to_long
42-
from cryptojwt.utils import base64url_to_long
43-
from cryptojwt.utils import long2intarr
15+
from cryptojwt.exception import (
16+
DeSerializationNotPossible,
17+
UnsupportedAlgorithm,
18+
WrongUsage,
19+
)
20+
from cryptojwt.jwk import (
21+
JWK,
22+
calculate_x5t,
23+
certificate_fingerprint,
24+
pem_hash,
25+
pems_to_x5c,
26+
)
27+
from cryptojwt.jwk.ec import NIST2SEC, ECKey
28+
from cryptojwt.jwk.hmac import SYMKey, new_sym_key, sha256_digest
29+
from cryptojwt.jwk.jwk import dump_jwk, import_jwk, jwk_wrap, key_from_jwk_dict
30+
from cryptojwt.jwk.rsa import (
31+
RSAKey,
32+
import_private_rsa_key_from_file,
33+
import_public_rsa_key_from_file,
34+
import_rsa_key_from_cert_file,
35+
new_rsa_key,
36+
)
37+
from cryptojwt.utils import (
38+
as_bytes,
39+
as_unicode,
40+
b64e,
41+
base64_to_long,
42+
base64url_to_long,
43+
long2intarr,
44+
)
4445

4546
__author__ = "Roland Hedberg"
4647
BASEDIR = os.path.abspath(os.path.dirname(__file__))

‎tests/test_03_key_bundle.py

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,22 @@
1010
import responses
1111
from cryptography.hazmat.primitives.asymmetric import rsa
1212

13-
from cryptojwt.jwk.ec import ECKey
14-
from cryptojwt.jwk.ec import new_ec_key
13+
from cryptojwt.jwk.ec import ECKey, new_ec_key
1514
from cryptojwt.jwk.hmac import SYMKey
16-
from cryptojwt.jwk.rsa import RSAKey
17-
from cryptojwt.jwk.rsa import import_rsa_key_from_cert_file
18-
from cryptojwt.jwk.rsa import new_rsa_key
19-
from cryptojwt.key_bundle import KeyBundle
20-
from cryptojwt.key_bundle import build_key_bundle
21-
from cryptojwt.key_bundle import dump_jwks
22-
from cryptojwt.key_bundle import init_key
23-
from cryptojwt.key_bundle import key_diff
24-
from cryptojwt.key_bundle import key_gen
25-
from cryptojwt.key_bundle import key_rollover
26-
from cryptojwt.key_bundle import keybundle_from_local_file
27-
from cryptojwt.key_bundle import rsa_init
28-
from cryptojwt.key_bundle import unique_keys
29-
from cryptojwt.key_bundle import update_key_bundle
15+
from cryptojwt.jwk.rsa import RSAKey, import_rsa_key_from_cert_file, new_rsa_key
16+
from cryptojwt.key_bundle import (
17+
KeyBundle,
18+
build_key_bundle,
19+
dump_jwks,
20+
init_key,
21+
key_diff,
22+
key_gen,
23+
key_rollover,
24+
keybundle_from_local_file,
25+
rsa_init,
26+
unique_keys,
27+
update_key_bundle,
28+
)
3029

3130
__author__ = "Roland Hedberg"
3231

‎tests/test_04_key_issuer.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,8 @@
77

88
from cryptojwt.exception import JWKESTException
99
from cryptojwt.jwk.hmac import SYMKey
10-
from cryptojwt.key_bundle import KeyBundle
11-
from cryptojwt.key_bundle import keybundle_from_local_file
12-
from cryptojwt.key_issuer import KeyIssuer
13-
from cryptojwt.key_issuer import build_keyissuer
14-
from cryptojwt.key_issuer import init_key_issuer
10+
from cryptojwt.key_bundle import KeyBundle, keybundle_from_local_file
11+
from cryptojwt.key_issuer import KeyIssuer, build_keyissuer, init_key_issuer
1512

1613
__author__ = "Roland Hedberg"
1714

‎tests/test_04_key_jar.py

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,11 @@
55

66
import pytest
77

8-
from cryptojwt.exception import IssuerNotFound
9-
from cryptojwt.exception import JWKESTException
8+
from cryptojwt.exception import IssuerNotFound, JWKESTException
109
from cryptojwt.jwe.jwenc import JWEnc
11-
from cryptojwt.jws.jws import JWS
12-
from cryptojwt.jws.jws import factory
13-
from cryptojwt.key_bundle import KeyBundle
14-
from cryptojwt.key_bundle import keybundle_from_local_file
15-
from cryptojwt.key_bundle import rsa_init
16-
from cryptojwt.key_jar import KeyJar
17-
from cryptojwt.key_jar import build_keyjar
18-
from cryptojwt.key_jar import init_key_jar
19-
from cryptojwt.key_jar import rotate_keys
10+
from cryptojwt.jws.jws import JWS, factory
11+
from cryptojwt.key_bundle import KeyBundle, keybundle_from_local_file, rsa_init
12+
from cryptojwt.key_jar import KeyJar, build_keyjar, init_key_jar, rotate_keys
2013

2114
__author__ = "Roland Hedberg"
2215

‎tests/test_06_jws.py

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,16 @@
77
from cryptography.hazmat.backends import default_backend
88
from cryptography.hazmat.primitives.asymmetric import ec
99

10-
from cryptojwt.exception import BadSignature
11-
from cryptojwt.exception import UnknownAlgorithm
12-
from cryptojwt.exception import WrongNumberOfParts
10+
from cryptojwt.exception import BadSignature, UnknownAlgorithm, WrongNumberOfParts
1311
from cryptojwt.jwk.ec import ECKey
1412
from cryptojwt.jwk.hmac import SYMKey
15-
from cryptojwt.jwk.rsa import RSAKey
16-
from cryptojwt.jwk.rsa import import_private_rsa_key_from_file
17-
from cryptojwt.jws.exception import FormatError
18-
from cryptojwt.jws.exception import NoSuitableSigningKeys
19-
from cryptojwt.jws.exception import SignerAlgError
20-
from cryptojwt.jws.jws import JWS
21-
from cryptojwt.jws.jws import SIGNER_ALGS
22-
from cryptojwt.jws.jws import JWSig
23-
from cryptojwt.jws.jws import factory
13+
from cryptojwt.jwk.rsa import RSAKey, import_private_rsa_key_from_file
14+
from cryptojwt.jws.exception import FormatError, NoSuitableSigningKeys, SignerAlgError
15+
from cryptojwt.jws.jws import JWS, SIGNER_ALGS, JWSig, factory
2416
from cryptojwt.jws.rsa import RSASigner
25-
from cryptojwt.jws.utils import left_hash
26-
from cryptojwt.jws.utils import parse_rsa_algorithm
17+
from cryptojwt.jws.utils import left_hash, parse_rsa_algorithm
2718
from cryptojwt.key_bundle import KeyBundle
28-
from cryptojwt.utils import b64d
29-
from cryptojwt.utils import b64d_enc_dec
30-
from cryptojwt.utils import b64e
31-
from cryptojwt.utils import intarr2bin
19+
from cryptojwt.utils import b64d, b64d_enc_dec, b64e, intarr2bin
3220

3321
BASEDIR = os.path.abspath(os.path.dirname(__file__))
3422

‎tests/test_07_jwe.py

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,34 +9,34 @@
99
from cryptography.hazmat.backends import default_backend
1010
from cryptography.hazmat.primitives.asymmetric import ec
1111

12-
from cryptojwt.exception import BadSyntax
13-
from cryptojwt.exception import HeaderError
14-
from cryptojwt.exception import MissingKey
15-
from cryptojwt.exception import Unsupported
16-
from cryptojwt.exception import VerificationError
17-
from cryptojwt.jwe.aes import AES_CBCEncrypter
18-
from cryptojwt.jwe.aes import AES_GCMEncrypter
19-
from cryptojwt.jwe.exception import NoSuitableDecryptionKey
20-
from cryptojwt.jwe.exception import NoSuitableEncryptionKey
21-
from cryptojwt.jwe.exception import UnsupportedBitLength
22-
from cryptojwt.jwe.exception import WrongEncryptionAlgorithm
23-
from cryptojwt.jwe.jwe import JWE
24-
from cryptojwt.jwe.jwe import factory
12+
from cryptojwt.exception import (
13+
BadSyntax,
14+
HeaderError,
15+
MissingKey,
16+
Unsupported,
17+
VerificationError,
18+
)
19+
from cryptojwt.jwe.aes import AES_CBCEncrypter, AES_GCMEncrypter
20+
from cryptojwt.jwe.exception import (
21+
NoSuitableDecryptionKey,
22+
NoSuitableEncryptionKey,
23+
UnsupportedBitLength,
24+
WrongEncryptionAlgorithm,
25+
)
26+
from cryptojwt.jwe.jwe import JWE, factory
2527
from cryptojwt.jwe.jwe_ec import JWE_EC
2628
from cryptojwt.jwe.jwe_hmac import JWE_SYM
2729
from cryptojwt.jwe.jwe_rsa import JWE_RSA
2830
from cryptojwt.jwe.utils import split_ctx_and_tag
2931
from cryptojwt.jwk.ec import ECKey
3032
from cryptojwt.jwk.hmac import SYMKey
31-
from cryptojwt.jwk.rsa import RSAKey
32-
from cryptojwt.jwk.rsa import import_private_rsa_key_from_file
33-
from cryptojwt.utils import as_bytes
34-
from cryptojwt.utils import b64e
33+
from cryptojwt.jwk.rsa import RSAKey, import_private_rsa_key_from_file
34+
from cryptojwt.utils import as_bytes, b64e
3535

3636
__author__ = "rohe0002"
3737

3838
try:
39-
import random.SystemRandom as rnd
39+
from random import SystemRandom as rnd
4040
except ImportError:
4141
import random as rnd
4242

‎tests/test_09_jwt.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,11 @@
22

33
import pytest
44

5-
from cryptojwt.exception import IssuerNotFound
6-
from cryptojwt.exception import JWKESTException
5+
from cryptojwt.exception import IssuerNotFound, JWKESTException
76
from cryptojwt.jws.exception import NoSuitableSigningKeys
8-
from cryptojwt.jwt import JWT
9-
from cryptojwt.jwt import pick_key
7+
from cryptojwt.jwt import JWT, pick_key
108
from cryptojwt.key_bundle import KeyBundle
11-
from cryptojwt.key_jar import KeyJar
12-
from cryptojwt.key_jar import init_key_jar
9+
from cryptojwt.key_jar import KeyJar, init_key_jar
1310

1411
__author__ = "Roland Hedberg"
1512

‎tests/test_10_jwk_wrap.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
from cryptojwt.jwk.ec import new_ec_key
44
from cryptojwt.jwk.hmac import SYMKey
55
from cryptojwt.jwk.rsa import new_rsa_key
6-
from cryptojwt.jwk.wrap import unwrap_key
7-
from cryptojwt.jwk.wrap import wrap_key
6+
from cryptojwt.jwk.wrap import unwrap_key, wrap_key
87

98
__author__ = "jschlyter"
109

0 commit comments

Comments
 (0)