electrum

commit 40ae744c1e4dbc8afdb2a7cca3c160b4e9fa655f
parent e6afaf173c5a90137aa6b6359155c6c6a85eccfa
Author: Neil Booth <kyuupichan@gmail.com>
Date:   Sun,  3 Jan 2016 11:18:20 +0900

Fix show_error inheritance issue

Diffstat:
M
gui/qt/installwizard.py
 | 
4
++--
M
gui/qt/util.py
 | 
2
+-

2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/gui/qt/installwizard.py b/gui/qt/installwizard.py
@@ -54,8 +54,8 @@ class CosignWidget(QWidget):
         qp.end()
 
 
-# WizardBase must come first as we override show_error
-class InstallWizard(WizardBase, WindowModalDialog):
+# WindowModalDialog must come first as it overrides show_error
+class InstallWizard(WindowModalDialog, WizardBase):
 
     def __init__(self, config, app, plugins):
         title = 'Electrum  -  ' + _('Install Wizard')
diff --git a/gui/qt/util.py b/gui/qt/util.py
@@ -155,7 +155,7 @@ class CancelButton(QPushButton):
         QPushButton.__init__(self, label or _("Cancel"))
         self.clicked.connect(dialog.reject)
 
-class MessageBoxMixin:
+class MessageBoxMixin(object):
     def question(self, msg, parent=None, title=None, icon=None):
         Yes, No = QMessageBox.Yes, QMessageBox.No
         return self.msg_box(icon or QMessageBox.Question,