Add isort (#252)

asherf · web-flow · commit 36dde956c620 · 2021-05-06T15:09:49.000-07:00
diff --git a/jose/__init__.py b/jose/__init__.py
@@ -4,7 +4,7 @@
 __copyright__ = 'Copyright 2016 Michael Davis'
 
 
+from .exceptions import ExpiredSignatureError  # noqa: F401
 from .exceptions import JOSEError  # noqa: F401
 from .exceptions import JWSError  # noqa: F401
-from .exceptions import ExpiredSignatureError  # noqa: F401
 from .exceptions import JWTError  # noqa: F401
diff --git a/jose/backends/__init__.py b/jose/backends/__init__.py
@@ -1,31 +1,37 @@
 try:
-    from jose.backends.cryptography_backend import get_random_bytes  # noqa: F401
+    from jose.backends.cryptography_backend import \
+        get_random_bytes  # noqa: F401
 except ImportError:
     try:
-        from jose.backends.pycrypto_backend import get_random_bytes  # noqa: F401
+        from jose.backends.pycrypto_backend import \
+            get_random_bytes  # noqa: F401
     except ImportError:
         from jose.backends.native import get_random_bytes  # noqa: F401
 
 try:
-    from jose.backends.cryptography_backend import CryptographyRSAKey as RSAKey  # noqa: F401
+    from jose.backends.cryptography_backend import \
+        CryptographyRSAKey as RSAKey  # noqa: F401
 except ImportError:
     try:
         from jose.backends.rsa_backend import RSAKey  # noqa: F401
     except ImportError:
         RSAKey = None
 
 try:
-    from jose.backends.cryptography_backend import CryptographyECKey as ECKey  # noqa: F401
+    from jose.backends.cryptography_backend import \
+        CryptographyECKey as ECKey  # noqa: F401
 except ImportError:
     from jose.backends.ecdsa_backend import ECDSAECKey as ECKey  # noqa: F401
 
 try:
-    from jose.backends.cryptography_backend import CryptographyAESKey as AESKey  # noqa: F401
+    from jose.backends.cryptography_backend import \
+        CryptographyAESKey as AESKey  # noqa: F401
 except ImportError:
     AESKey = None
 
 try:
-    from jose.backends.cryptography_backend import CryptographyHMACKey as HMACKey  # noqa: F401
+    from jose.backends.cryptography_backend import \
+        CryptographyHMACKey as HMACKey  # noqa: F401
 except ImportError:
     from jose.backends.native import HMACKey  # noqa: F401
 
diff --git a/jose/backends/cryptography_backend.py b/jose/backends/cryptography_backend.py
@@ -2,25 +2,30 @@
 import warnings
 
 import six
-
-from .base import Key
-from ..utils import base64_to_long, long_to_base64, base64url_decode, base64url_encode
-from ..constants import ALGORITHMS
-from ..exceptions import JWKError, JWEError
-
 from cryptography.exceptions import InvalidSignature, InvalidTag
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.bindings.openssl.binding import Binding
-from cryptography.hazmat.primitives import hashes, serialization, hmac
-from cryptography.hazmat.primitives.asymmetric import ec, rsa, padding
-from cryptography.hazmat.primitives.asymmetric.utils import decode_dss_signature, encode_dss_signature
-from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, aead, modes
-from cryptography.hazmat.primitives.keywrap import aes_key_wrap, aes_key_unwrap, InvalidUnwrap
+from cryptography.hazmat.primitives import hashes, hmac, serialization
+from cryptography.hazmat.primitives.asymmetric import ec, padding, rsa
+from cryptography.hazmat.primitives.asymmetric.utils import (
+    decode_dss_signature, encode_dss_signature)
+from cryptography.hazmat.primitives.ciphers import (Cipher, aead, algorithms,
+                                                    modes)
+from cryptography.hazmat.primitives.keywrap import (InvalidUnwrap,
+                                                    aes_key_unwrap,
+                                                    aes_key_wrap)
 from cryptography.hazmat.primitives.padding import PKCS7
-from cryptography.hazmat.primitives.serialization import load_pem_private_key, load_pem_public_key
+from cryptography.hazmat.primitives.serialization import (load_pem_private_key,
+                                                          load_pem_public_key)
 from cryptography.utils import int_to_bytes
 from cryptography.x509 import load_pem_x509_certificate
 
+from ..constants import ALGORITHMS
+from ..exceptions import JWEError, JWKError
+from ..utils import (base64_to_long, base64url_decode, base64url_encode,
+                     long_to_base64)
+from .base import Key
+
 _binding = None
 
 
diff --git a/jose/backends/ecdsa_backend.py b/jose/backends/ecdsa_backend.py
@@ -1,8 +1,8 @@
 import hashlib
 
-from jose.backends.base import Key
 import ecdsa
 
+from jose.backends.base import Key
 from jose.constants import ALGORITHMS
 from jose.exceptions import JWKError
 from jose.utils import base64_to_long, long_to_base64
diff --git a/jose/backends/native.py b/jose/backends/native.py
@@ -2,7 +2,6 @@
 import hmac
 import os
 
-
 from jose.backends.base import Key
 from jose.constants import ALGORITHMS
 from jose.exceptions import JWKError
diff --git a/jose/backends/rsa_backend.py b/jose/backends/rsa_backend.py
@@ -1,21 +1,17 @@
 import binascii
-
 import warnings
 
-from pyasn1.error import PyAsn1Error
-
 import rsa as pyrsa
 import rsa.pem as pyrsa_pem
+from pyasn1.error import PyAsn1Error
 from rsa import DecryptionError
 
+from jose.backends._asn1 import (rsa_private_key_pkcs1_to_pkcs8,
+                                 rsa_private_key_pkcs8_to_pkcs1,
+                                 rsa_public_key_pkcs1_to_pkcs8)
 from jose.backends.base import Key
-from jose.backends._asn1 import (
-    rsa_private_key_pkcs1_to_pkcs8,
-    rsa_private_key_pkcs8_to_pkcs1,
-    rsa_public_key_pkcs1_to_pkcs8,
-)
 from jose.constants import ALGORITHMS
-from jose.exceptions import JWKError, JWEError
+from jose.exceptions import JWEError, JWKError
 from jose.utils import base64_to_long, long_to_base64
 
 ALGORITHMS.SUPPORTED.remove(ALGORITHMS.RSA_OAEP)  # RSA OAEP not supported
diff --git a/jose/jwe.py b/jose/jwe.py
@@ -10,11 +10,11 @@
 except ImportError:
     from collections import Mapping  # Python 2, will be deprecated in Python 3.8
 
+from . import jwk
 from .backends import get_random_bytes
 from .constants import ALGORITHMS, ZIPS
-from .exceptions import JWEParseError, JWEError
+from .exceptions import JWEError, JWEParseError
 from .utils import base64url_decode, base64url_encode
-from . import jwk
 
 
 def encrypt(plaintext, key, encryption=ALGORITHMS.A256GCM,
diff --git a/jose/jws.py b/jose/jws.py
@@ -1,14 +1,12 @@
 import binascii
 import json
-from collections.abc import Mapping, Iterable
+from collections.abc import Iterable, Mapping
 
 from jose import jwk
 from jose.backends.base import Key
 from jose.constants import ALGORITHMS
-from jose.exceptions import JWSError
-from jose.exceptions import JWSSignatureError
-from jose.utils import base64url_encode
-from jose.utils import base64url_decode
+from jose.exceptions import JWSError, JWSSignatureError
+from jose.utils import base64url_decode, base64url_encode
 
 
 def sign(payload, key, headers=None, algorithm=ALGORITHMS.HS256):
diff --git a/jose/jwt.py b/jose/jwt.py
@@ -1,14 +1,14 @@
 import json
-
 from calendar import timegm
 from collections.abc import Mapping
 from datetime import datetime, timedelta
 
 from jose import jws
 
-from .exceptions import JWSError, JWTClaimsError, JWTError, ExpiredSignatureError
 from .constants import ALGORITHMS
-from .utils import timedelta_total_seconds, calculate_at_hash
+from .exceptions import (ExpiredSignatureError, JWSError, JWTClaimsError,
+                         JWTError)
+from .utils import calculate_at_hash, timedelta_total_seconds
 
 
 def encode(claims, key, algorithm=ALGORITHMS.HS256, headers=None, access_token=None):
diff --git a/setup.py b/setup.py
@@ -2,10 +2,9 @@
 import os
 from pathlib import Path
 
-import jose  # noqa: F401
-
 from setuptools import setup
 
+import jose  # noqa: F401
 
 long_description = (Path(__file__).parent / 'README.rst').read_text()
 
diff --git a/tests/algorithms/test_AES.py b/tests/algorithms/test_AES.py
@@ -1,4 +1,4 @@
-from binascii import unhexlify, hexlify
+from binascii import hexlify, unhexlify
 
 import pytest
 import six
diff --git a/tests/algorithms/test_AES_compat.py b/tests/algorithms/test_AES_compat.py
@@ -5,8 +5,8 @@
 except ImportError:
     CryptographyAESKey = None
 
-from jose.exceptions import JWEError
 from jose.constants import ALGORITHMS
+from jose.exceptions import JWEError
 
 CRYPTO_BACKENDS = (
     pytest.param(CryptographyAESKey, id="pyca/cryptography"),
diff --git a/tests/algorithms/test_EC.py b/tests/algorithms/test_EC.py
@@ -1,19 +1,22 @@
 import json
 
+from jose.backends import ECKey
 from jose.constants import ALGORITHMS
 from jose.exceptions import JOSEError, JWKError
 
-from jose.backends import ECKey
 try:
-    from jose.backends.ecdsa_backend import ECDSAECKey
     import ecdsa
+
+    from jose.backends.ecdsa_backend import ECDSAECKey
 except ImportError:
     ECDSAECKey = ecdsa = None
 
 try:
-    from jose.backends.cryptography_backend import CryptographyECKey
+    from cryptography.hazmat.backends import \
+        default_backend as CryptographyBackend
     from cryptography.hazmat.primitives.asymmetric import ec as CryptographyEc
-    from cryptography.hazmat.backends import default_backend as CryptographyBackend
+
+    from jose.backends.cryptography_backend import CryptographyECKey
 except ImportError:
     CryptographyECKey = CryptographyEc = CryptographyBackend = None
 
diff --git a/tests/algorithms/test_EC_compat.py b/tests/algorithms/test_EC_compat.py
@@ -1,8 +1,8 @@
 import pytest
 
 try:
-    from jose.backends.ecdsa_backend import ECDSAECKey
     from jose.backends.cryptography_backend import CryptographyECKey
+    from jose.backends.ecdsa_backend import ECDSAECKey
 except ImportError:
     ECDSAECKey = CryptographyECKey = None
 from jose.constants import ALGORITHMS
diff --git a/tests/algorithms/test_HMAC.py b/tests/algorithms/test_HMAC.py
@@ -1,10 +1,10 @@
 import json
 
+import pytest
+
+from jose.backends.native import HMACKey
 from jose.constants import ALGORITHMS
 from jose.exceptions import JOSEError
-from jose.backends.native import HMACKey
-
-import pytest
 
 
 class TestHMACAlgorithm:
diff --git a/tests/algorithms/test_RSA.py b/tests/algorithms/test_RSA.py
@@ -2,8 +2,8 @@
 import json
 
 try:
-    from jose.backends.rsa_backend import RSAKey as PurePythonRSAKey
     from jose.backends import rsa_backend
+    from jose.backends.rsa_backend import RSAKey as PurePythonRSAKey
 except ImportError:
     PurePythonRSAKey = rsa_backend = None
 
@@ -15,17 +15,17 @@
 try:
     from cryptography.hazmat.backends import default_backend
     from cryptography.hazmat.primitives.asymmetric import rsa as pyca_rsa
+
     from jose.backends.cryptography_backend import CryptographyRSAKey
 except ImportError:
     default_backend = pyca_rsa = CryptographyRSAKey = None
 
+import pytest
+
 from jose.backends import RSAKey
 from jose.constants import ALGORITHMS
 from jose.exceptions import JOSEError, JWKError
 
-import pytest
-
-
 private_key_4096_pkcs1 = b"""-----BEGIN RSA PRIVATE KEY-----
 MIIJKwIBAAKCAgEAtSKfSeI0fukRIX38AHlKB1YPpX8PUYN2JdvfM+XjNmLfU1M7
 4N0VmdzIX95sneQGO9kC2xMIE+AIlt52Yf/KgBZggAlS9Y0Vx8DsSL2HvOjguAdX
diff --git a/tests/algorithms/test_RSA_compat.py b/tests/algorithms/test_RSA_compat.py
@@ -1,8 +1,8 @@
 import pytest
 
 try:
-    from jose.backends.rsa_backend import RSAKey as PurePythonRSAKey
     from jose.backends.cryptography_backend import CryptographyRSAKey
+    from jose.backends.rsa_backend import RSAKey as PurePythonRSAKey
 except ImportError:
     PurePythonRSAKey = CryptographyRSAKey =  None
 from jose.constants import ALGORITHMS
diff --git a/tests/algorithms/test_base.py b/tests/algorithms/test_base.py
@@ -1,7 +1,7 @@
-from jose.jwk import Key
-
 import pytest
 
+from jose.jwk import Key
+
 
 @pytest.fixture
 def alg():
diff --git a/tests/rfc/test_rfc7520.py b/tests/rfc/test_rfc7520.py
@@ -3,8 +3,8 @@
 
 import pytest
 
-from jose.jws import verify
 from jose.backends import RSAKey
+from jose.jws import verify
 
 expected_payload = b"It\xe2\x80\x99s a dangerous business, Frodo, going out your door. You step onto the road, and if you don't keep your feet, there\xe2\x80\x99s no knowing where you might be swept off to."
 
diff --git a/tests/test_backends.py b/tests/test_backends.py
@@ -4,7 +4,8 @@
 except ImportError:
     PurePythonRSAKey = None
 try:
-    from jose.backends.cryptography_backend import CryptographyRSAKey, CryptographyECKey
+    from jose.backends.cryptography_backend import (CryptographyECKey,
+                                                    CryptographyRSAKey)
 except ImportError:
     CryptographyRSAKey = CryptographyECKey = None
 try:
@@ -21,10 +22,9 @@
 except ImportError:
     CryptographyHMACKey = None
 
+from jose.backends import ECKey, HMACKey, RSAKey
 from jose.backends.native import HMACKey as NativeHMACKey
 
-from jose.backends import ECKey, RSAKey, HMACKey
-
 try:
     from jose.backends import AESKey
 except ImportError:
diff --git a/tests/test_firebase.py b/tests/test_firebase.py
@@ -3,8 +3,8 @@
 import pytest
 
 from jose import jwt
-
 from jose.backends import RSAKey
+
 try:
     from jose.backends.rsa_backend import RSAKey as RsaRSAKey
 except ImportError:
diff --git a/tests/test_jwe.py b/tests/test_jwe.py
@@ -7,8 +7,7 @@
 from jose import jwe
 from jose.constants import ALGORITHMS, ZIPS
 from jose.exceptions import JWEParseError
-from jose.jwk import AESKey
-from jose.jwk import RSAKey
+from jose.jwk import AESKey, RSAKey
 from jose.utils import base64url_decode
 
 backends = []
diff --git a/tests/test_jwk.py b/tests/test_jwk.py
@@ -1,9 +1,9 @@
+import pytest
+
 from jose import jwk
-from jose.exceptions import JWKError
+from jose.backends import AESKey, ECKey, HMACKey, RSAKey
 from jose.backends.base import Key
-from jose.backends import ECKey, RSAKey, HMACKey, AESKey
-
-import pytest
+from jose.exceptions import JWKError
 
 hmac_key = {
     "kty": "oct",
diff --git a/tests/test_jws.py b/tests/test_jws.py
@@ -3,8 +3,7 @@
 
 import pytest
 
-from jose import jwk
-from jose import jws
+from jose import jwk, jws
 from jose.backends import RSAKey
 from jose.constants import ALGORITHMS
 from jose.exceptions import JWSError
diff --git a/tests/test_jwt.py b/tests/test_jwt.py
diff --git a/tox.ini b/tox.ini
