tox: order imports

tox.ini

@@ -11,8 +11,10 @@ deps=
     pylint
     semver
     pydocstyle
+    isort
 commands=
     pep8 trezor_agent
+    isort --skip-glob .tox -c -r trezor_agent
     pylint --reports=no --rcfile .pylintrc trezor_agent
     pydocstyle trezor_agent
     coverage run --omit='trezor_agent/__main__.py' --source trezor_agent -m py.test -v trezor_agent

trezor_agent/device/keepkey_defs.py

@@ -1,8 +1,9 @@
 """KeepKey-related definitions."""
 
 # pylint: disable=unused-import
+
+from keepkeylib.client import CallException as Error
 from keepkeylib.client import KeepKeyClient as Client
-from keepkeylib.client import CallException
-from keepkeylib.transport_hid import HidTransport
 from keepkeylib.messages_pb2 import PassphraseAck
+from keepkeylib.transport_hid import HidTransport
 from keepkeylib.types_pb2 import IdentityType

trezor_agent/device/trezor.py

@@ -2,6 +2,7 @@
 
 import binascii
 import logging
+
 import semver
 
 from . import interface
@@ -84,7 +85,7 @@ class Trezor(interface.Device):
             assert len(result.signature) == 65
             assert result.signature[:1] == b'\x00'
             return result.signature[1:]
-        except self._defs.CallException as e:
+        except self._defs.Error as e:
             msg = '{} error: {}'.format(self, e)
             log.debug(msg, exc_info=True)
             raise interface.DeviceError(msg)
@@ -103,7 +104,7 @@ class Trezor(interface.Device):
             assert len(result.session_key) in {65, 33}  # NIST256 or Curve25519
             assert result.session_key[:1] == b'\x04'
             return result.session_key
-        except self._defs.CallException as e:
+        except self._defs.Error as e:
             msg = '{} error: {}'.format(self, e)
             log.debug(msg, exc_info=True)
             raise interface.DeviceError(msg)

trezor_agent/device/trezor_defs.py

@@ -1,8 +1,9 @@
 """TREZOR-related definitions."""
 
 # pylint: disable=unused-import
+
+from trezorlib.client import CallException as Error
 from trezorlib.client import TrezorClient as Client
-from trezorlib.client import CallException
-from trezorlib.transport_hid import HidTransport
 from trezorlib.messages_pb2 import PassphraseAck
+from trezorlib.transport_hid import HidTransport
 from trezorlib.types_pb2 import IdentityType

trezor_agent/gpg/agent.py

@@ -2,7 +2,7 @@
 import binascii
 import logging
 
-from . import decode, client, keyring, protocol
+from . import client, decode, keyring, protocol
 from .. import util
 
 log = logging.getLogger(__name__)