Include isort make target

Makefile

@@ -44,3 +44,6 @@ fix: black
 
 black:
 	$(BIN)/black tests/
+
+isort:
+	$(BIN)/isort -y --recursive tests/

README.md

@@ -45,6 +45,8 @@ The `make venv` setup method installs git pre-commit hooks that check conformanc
 
 You can also `make check` and `make fix` manually, or use an editor plugin.
 
+Additionally, please run `make isort` before committing.
+
 # License
 
 Apache-2.0 OR MIT

dev-requirements.txt

@@ -1,2 +1,3 @@
 black==18.9b0  # 19.3b0 has an issue on Windows
+isort
 pre-commit

tests/conftest.py

@@ -1,18 +1,14 @@
-import pytest
-
-import time
 import struct
+import time
 
-from fido2.hid import CtapHidDevice
-from fido2.client import Fido2Client
+import pytest
 from fido2.attestation import Attestation
-from fido2.ctap1 import CTAP1
-from fido2.utils import Timeout
+from fido2.client import Fido2Client, _call_polling
 from fido2.ctap import CtapError
-from fido2.ctap2 import ES256, PinProtocolV1, AttestedCredentialData
-from fido2.utils import sha256, hmac_sha256
-from fido2.client import _call_polling
-
+from fido2.ctap1 import CTAP1
+from fido2.ctap2 import ES256, AttestedCredentialData, PinProtocolV1
+from fido2.hid import CtapHidDevice
+from fido2.utils import Timeout, hmac_sha256, sha256
 from solo.fido2 import force_udp_backend
 
 from tests.utils import *

tests/standard/connect_test.py

@@ -1,6 +1,7 @@
-import tests
 import pytest
 
+import tests
+
 
 @pytest.mark.run(order=1)
 def test_answer(device):

tests/standard/fido2/extensions/test_hmac_secret.py

@@ -1,11 +1,10 @@
 import pytest
-
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
-from fido2.utils import sha256, hmac_sha256
 from fido2.ctap import CtapError
+from fido2.utils import hmac_sha256, sha256
 
-from tests.utils import FidoRequest, verify, shannon_entropy
+from tests.utils import FidoRequest, shannon_entropy, verify
 
 
 def get_salt_params(cipher, shared_secret, salts):

tests/standard/fido2/pin/test_lockout.py

@@ -1,7 +1,6 @@
 import pytest
-
 from fido2.ctap import CtapError
-from fido2.ctap2 import ES256, PinProtocolV1, AttestedCredentialData
+from fido2.ctap2 import ES256, AttestedCredentialData, PinProtocolV1
 
 from tests.utils import *
 

tests/standard/fido2/pin/test_pin.py

@@ -1,7 +1,6 @@
 import pytest
-
 from fido2.ctap import CtapError
-from fido2.ctap2 import ES256, PinProtocolV1, AttestedCredentialData
+from fido2.ctap2 import ES256, AttestedCredentialData, PinProtocolV1
 
 from tests.utils import *
 

tests/standard/fido2/pin/test_set_pin.py

@@ -1,7 +1,6 @@
 import pytest
-
 from fido2.ctap import CtapError
-from fido2.ctap2 import ES256, PinProtocolV1, AttestedCredentialData
+from fido2.ctap2 import ES256, AttestedCredentialData, PinProtocolV1
 
 from tests.utils import *
 

tests/standard/fido2/test_ctap1_interop.py

@@ -1,8 +1,7 @@
 import pytest
-
 from fido2.ctap import CtapError
-from fido2.utils import sha256, hmac_sha256
-from fido2.ctap2 import ES256, PinProtocolV1, AttestedCredentialData
+from fido2.ctap2 import ES256, AttestedCredentialData, PinProtocolV1
+from fido2.utils import hmac_sha256, sha256
 
 from tests.utils import FidoRequest
 

tests/standard/fido2/test_get_assertion.py

@@ -1,7 +1,6 @@
 import pytest
-
 from fido2.ctap import CtapError
-from fido2.utils import sha256, hmac_sha256
+from fido2.utils import hmac_sha256, sha256
 
 from tests.utils import *
 

tests/standard/fido2/test_getinfo.py

@@ -1,5 +1,4 @@
 import pytest
-
 from fido2 import cbor
 from fido2.ctap import CtapError
 

tests/standard/fido2/test_make_credential.py

@@ -1,8 +1,7 @@
 import pytest
-
 from fido2.ctap import CtapError
-from fido2.utils import sha256, hmac_sha256
-from fido2.ctap2 import ES256, PinProtocolV1, AttestedCredentialData
+from fido2.ctap2 import ES256, AttestedCredentialData, PinProtocolV1
+from fido2.utils import hmac_sha256, sha256
 
 from tests.utils import FidoRequest
 

tests/standard/fido2/test_reset.py

@@ -1,7 +1,7 @@
-import tests
-
 from fido2.ctap import CtapError
 
+import tests
+
 
 def test_reset(device):
     device.reset()

tests/standard/fido2/test_reset_credential.py

@@ -1,5 +1,4 @@
 import pytest
-
 from fido2.ctap import CtapError
 
 from tests.utils import *

tests/standard/fido2/test_resident_key.py

@@ -1,5 +1,4 @@
 import pytest
-
 from fido2.ctap import CtapError
 
 from tests.utils import *

tests/standard/transport/test_hid.py

@@ -1,9 +1,12 @@
-import sys, os, time, socket
-import pytest
+import os
+import socket
+import sys
+import time
 from binascii import hexlify
 
-from fido2.hid import CTAPHID
+import pytest
 from fido2.ctap import CtapError
+from fido2.hid import CTAPHID
 
 
 class TestHID(object):

tests/standard/u2f/test_u2f.py

@@ -1,8 +1,8 @@
 import pytest
-from fido2.ctap1 import CTAP1, ApduError, APDU
+from fido2.ctap1 import APDU, CTAP1, ApduError
 from fido2.utils import sha256
 
-from tests.utils import verify, FidoRequest
+from tests.utils import FidoRequest, verify
 
 
 class TestU2F(object):

tests/utils.py

@@ -1,10 +1,9 @@
-import secrets
-import random
 import math
+import random
+import secrets
 
-from fido2.ctap2 import ES256, PinProtocolV1, AttestedCredentialData
-from fido2.utils import sha256, hmac_sha256
-
+from fido2.ctap2 import ES256, AttestedCredentialData, PinProtocolV1
+from fido2.utils import hmac_sha256, sha256
 
 name_list = open("data/first-names.txt").readlines()
 

tests/vendor/solo/test_solo.py

@@ -2,16 +2,13 @@ import math
 from binascii import hexlify
 
 import pytest
-
+from fido2.ctap import CtapError
+from fido2.ctap1 import ApduError
+from fido2.hid import CTAPHID
+from fido2.utils import sha256
 from solo.client import SoloClient
 from solo.commands import SoloExtension
 
-from fido2.ctap1 import ApduError
-from fido2.utils import sha256
-
-from fido2.hid import CTAPHID
-from fido2.ctap import CtapError
-
 from tests.utils import shannon_entropy