Construct base classes in right order

Fixed #1632
This commit is contained in:
Neil Booth 2016-01-16 10:19:48 +09:00
parent abdb7f8470
commit 98aef8418c
3 changed files with 3 additions and 2 deletions

View File

@ -3,9 +3,9 @@ from ..trezor.clientbase import TrezorClientBase
class KeepKeyClient(TrezorClientBase, ProtocolMixin, BaseClient):
def __init__(self, transport, handler, plugin, hid_id):
TrezorClientBase.__init__(self, handler, plugin, hid_id, proto)
BaseClient.__init__(self, transport)
ProtocolMixin.__init__(self, transport)
TrezorClientBase.__init__(self, handler, plugin, hid_id, proto)
def recovery_device(self, *args):
ProtocolMixin.recovery_device(self, True, *args)

View File

@ -3,9 +3,9 @@ from clientbase import TrezorClientBase
class TrezorClient(TrezorClientBase, ProtocolMixin, BaseClient):
def __init__(self, transport, handler, plugin, hid_id):
TrezorClientBase.__init__(self, handler, plugin, hid_id, proto)
BaseClient.__init__(self, transport)
ProtocolMixin.__init__(self, transport)
TrezorClientBase.__init__(self, handler, plugin, hid_id, proto)
TrezorClientBase.wrap_methods(TrezorClient)

View File

@ -65,6 +65,7 @@ class GuiMixin(object):
class TrezorClientBase(GuiMixin, PrintError):
def __init__(self, handler, plugin, hid_id, proto):
assert hasattr(self, 'tx_api') # ProtocolMixin already constructed?
self.proto = proto
self.device = plugin.device
self.handler = handler