electrum

commit b436042c89dc852790bc95287fae18bfe2158031
parent 47fef13e5bdfe73269e3071ebd72db982e5b26c0
Author: ThomasV <thomasv@electrum.org>
Date:   Sat, 13 Aug 2016 14:15:29 +0200

partially revert fdb810ba622dc7dbe1259cbafb5b28e19d2ab114

Diffstat:
M
plugins/trezor/plugin.py
 | 
6
++----
M
plugins/trezor/trezor.py
 | 
3
++-

2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/plugins/trezor/plugin.py b/plugins/trezor/plugin.py
@@ -97,8 +97,7 @@ class TrezorCompatiblePlugin(HW_PluginBase):
             pair = [device.path, None]
 
         try:
-            from trezorlib.transport_hid import HidTransport
-            return HidTransport(pair)
+            return self.HidTransport(pair)
         except BaseException as e:
             raise
             self.print_error("cannot connect at", device.path, str(e))
@@ -108,8 +107,7 @@ class TrezorCompatiblePlugin(HW_PluginBase):
         self.print_error("Trying to connect over Trezor Bridge...")
 
         try:
-            from trezorlib.transport_bridge import BridgeTransport
-            return BridgeTransport({'path': hexlify(device.path)})
+            return self.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
@@ -14,7 +14,8 @@ 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 DEVICE_IDS
+        from trezorlib.transport_hid import HidTransport, DEVICE_IDS
+        from trezorlib.transport_bridge import BridgeTransport
         libraries_available = True
     except ImportError:
         libraries_available = False