electrum

commit 3422d855c93f2fc8ad69a1241a75751e5453b7f0
parent ff39333d32f9b580d105a0ea78b465307b353b93
Author: Neil Booth <kyuupichan@gmail.com>
Date:   Sat,  2 Jan 2016 23:06:53 +0900

A few small fixes

Diffstat:
M
gui/qt/installwizard.py
 | 
3
---
M
plugins/trezor/qt_generic.py
 | 
5
+++--

2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/gui/qt/installwizard.py b/gui/qt/installwizard.py
@@ -79,9 +79,6 @@ class InstallWizard(WindowModalDialog, MessageBoxMixin, WizardBase):
             wallet = super(InstallWizard, self).open_wallet(*args)
         except UserCancelled:
             self.print_error("wallet creation cancelled by user")
-        except Exception as e:
-            traceback.print_exc(file=stdout)
-            self.show_error(str(e))
         return wallet
 
     def remove_from_recently_open(self, filename):
diff --git a/plugins/trezor/qt_generic.py b/plugins/trezor/qt_generic.py
@@ -6,6 +6,7 @@ from PyQt4.Qt import QVBoxLayout, QLabel, SIGNAL
 from electrum_gui.qt.main_window import StatusBarButton
 from electrum_gui.qt.password_dialog import PasswordDialog
 from electrum_gui.qt.util import *
+from plugin import TrezorCompatiblePlugin
 
 from electrum.i18n import _
 from electrum.plugins import hook
@@ -69,10 +70,10 @@ class QtHandler(PrintError):
 
     def passphrase_dialog(self, msg):
         d = PasswordDialog(self.window_stack[-1], None, msg,
-                           PasswordDialog.PW_PASSHPRASE)
+                           PasswordDialog.PW_PASSPHRASE)
         confirmed, p, passphrase = d.run()
         if confirmed:
-            passphrase = TrezorPlugin.normalize_passphrase(passphrase)
+            passphrase = TrezorCompatiblePlugin.normalize_passphrase(passphrase)
         self.passphrase = passphrase
         self.done.set()