From fdb810ba622dc7dbe1259cbafb5b28e19d2ab114 Mon Sep 17 00:00:00 2001 From: slush0 Date: Mon, 27 Jun 2016 17:16:55 +0200 Subject: [PATCH] Fixed TREZOR plugin to work with python-trezor>=0.7.0 (to be released). --- plugins/trezor/plugin.py | 8 ++++++-- plugins/trezor/trezor.py | 3 +-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/plugins/trezor/plugin.py b/plugins/trezor/plugin.py index 27fc6568..83389104 100644 --- a/plugins/trezor/plugin.py +++ b/plugins/trezor/plugin.py @@ -106,15 +106,19 @@ class TrezorCompatiblePlugin(HW_PluginBase): pair = [device.path, None] try: - return self.HidTransport(pair) + from trezorlib.transport_hid import HidTransport + return HidTransport(pair) except BaseException as e: + raise self.print_error("cannot connect at", device.path, str(e)) return None def _try_bridge(self, device): self.print_error("Trying to connect over Trezor Bridge...") + try: - return self.BridgeTransport({'path': hexlify(device.path)}) + from trezorlib.transport_bridge import BridgeTransport + return BridgeTransport({'path': hexlify(device.path)}) except BaseException as e: self.print_error("cannot connect to bridge", str(e)) return None diff --git a/plugins/trezor/trezor.py b/plugins/trezor/trezor.py index d1bb19d3..18a7066a 100644 --- a/plugins/trezor/trezor.py +++ b/plugins/trezor/trezor.py @@ -15,8 +15,7 @@ class TrezorPlugin(TrezorCompatiblePlugin): from .client import TrezorClient as client_class import trezorlib.ckd_public as ckd_public from trezorlib.client import types - from trezorlib.transport_hid import HidTransport, DEVICE_IDS - from trezorlib.transport_bridge import BridgeTransport + from trezorlib.transport_hid import DEVICE_IDS libraries_available = True except ImportError: libraries_available = False