AaronFiore/electrum
1
0
Fork 0
Code Activity

Better error when opening a non-wallet file

Browse Source 
Also window modality fixes for __init__.py
This commit is contained in:
Neil Booth
2015-12-23 13:54:43 +09:00
parent 1afb644203
commit 72fdf0cd21
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gui/qt/__init__.py
View File

@@ -134,7 +134,7 @@ class ElectrumGui:
try: try:
storage = WalletStorage(filename) storage = WalletStorage(filename)
except Exception as e: except Exception as e:
QMessageBox.information(None, _('Error'), str(e), _('OK')) WindowModalDialog.warning(None, _('Error'), str(e))
return return
if not storage.file_exists: if not storage.file_exists:
recent = self.config.get('recently_open', []) recent = self.config.get('recently_open', [])
@@ -147,7 +147,7 @@ class ElectrumGui:
wallet = Wallet(storage) wallet = Wallet(storage)
except BaseException as e: except BaseException as e:
traceback.print_exc(file=sys.stdout) traceback.print_exc(file=sys.stdout)
QMessageBox.warning(None, _('Warning'), str(e), _('OK')) WindowModalDialog.warning(None, _('Warning'), str(e))
return return
action = wallet.get_action() action = wallet.get_action()
# run wizard # run wizard

2
lib/wallet.py
View File

@@ -69,11 +69,11 @@ class WalletStorage(PrintError):
except: except:
try: try:
d = ast.literal_eval(data) #parse raw data from reading wallet file d = ast.literal_eval(data) #parse raw data from reading wallet file
labels = d.get('labels', {})
except Exception as e: except Exception as e:
raise IOError("Cannot read wallet file '%s'" % self.path) raise IOError("Cannot read wallet file '%s'" % self.path)
self.data = {} self.data = {}
# In old versions of Electrum labels were latin1 encoded, this fixes breakage. # In old versions of Electrum labels were latin1 encoded, this fixes breakage.
labels = d.get('labels', {})
for i, label in labels.items(): for i, label in labels.items():
try: try:
unicode(label) unicode(label)