electrum

commit 2a908d3e8ba561251759ac5e64c265113de4f936
parent 0f184db534299a319a2fd525421db3f60135ee60
Author: ThomasV <thomasv@electrum.org>
Date:   Sat, 30 Jan 2016 13:48:52 +0100

hw_wallet: do not mix qt and non-qt imports

Diffstat:
M
plugins/hw_wallet/__init__.py
 | 
1
-
M
plugins/ledger/qt.py
 | 
2
+-
M
plugins/trezor/qt_generic.py
 | 
2
+-

3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/plugins/hw_wallet/__init__.py b/plugins/hw_wallet/__init__.py
@@ -1,3 +1,2 @@
 from hw_wallet import BIP44_HW_Wallet
-from qt import QtHandlerBase
 from plugin import HW_PluginBase
diff --git a/plugins/ledger/qt.py b/plugins/ledger/qt.py
@@ -7,7 +7,7 @@ import PyQt4.QtCore as QtCore
 from electrum.i18n import _
 from electrum.plugins import hook
 from .ledger import LedgerPlugin, BTChipWallet
-from ..hw_wallet import QtHandlerBase
+from ..hw_wallet.qt import QtHandlerBase
 
 class Plugin(LedgerPlugin):
 
diff --git a/plugins/trezor/qt_generic.py b/plugins/trezor/qt_generic.py
@@ -7,7 +7,7 @@ from PyQt4.Qt import QVBoxLayout, QLabel, SIGNAL
 from electrum_gui.qt.main_window import StatusBarButton
 from electrum_gui.qt.util import *
 from .plugin import TIM_NEW, TIM_RECOVER, TIM_MNEMONIC
-from ..hw_wallet import QtHandlerBase
+from ..hw_wallet.qt import QtHandlerBase
 
 from electrum.i18n import _
 from electrum.plugins import hook, DeviceMgr