AaronFiore/electrum
1
0
Fork 0
Code Activity

replace BaseException with Exception

Browse Source
This commit is contained in:
Bryan Stitt
2013-11-09 20:21:02 -08:00
parent ba9782eec6
commit f0eb0eccde
15 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gui/android.py
View File

@@ -458,7 +458,7 @@ def pay_to(recipient, amount, fee, label):
try:
tx = wallet.mktx( [(recipient, amount)], password, fee)
except BaseException, e:
except Exception as e:
modal_dialog('error', e.message)
droid.dialogDismiss()
return

2
gui/gtk.py
View File

@@ -807,7 +807,7 @@ class ElectrumWindow:
try:
tx = self.wallet.mktx( [(to_address, amount)], password, fee )
except BaseException, e:
except Exception as e:
self.show_message(str(e))
return

4
gui/qt/lite_window.py
View File

@@ -750,7 +750,7 @@ class MiniActuator:
try:
tx = self.g.wallet.mktx([(dest_address, amount)], password, fee)
except BaseException as error:
except Exception as error:
QMessageBox.warning(parent_window, _('Error'), str(error), _('OK'))
return False
@@ -778,7 +778,7 @@ class MiniActuator:
with open(fileName,'w') as f:
f.write(json.dumps(tx.as_dict(),indent=4) + '\n')
QMessageBox.information(QWidget(), _('Unsigned transaction created'), _("Unsigned transaction was saved to file:") + " " +fileName, _('OK'))
except BaseException as e:
except Exception as e:
QMessageBox.warning(QWidget(), _('Error'), _('Could not write transaction to file: %s' % e), _('OK'))
return True

12
gui/qt/main_window.py
View File

@@ -889,7 +889,7 @@ class ElectrumWindow(QMainWindow):
try:
tx = self.wallet.mktx_from_account( [(to_address, amount)], password, fee, self.current_account)
except BaseException, e:
except Exception as e:
traceback.print_exc(file=sys.stdout)
self.show_message(str(e))
return
@@ -1635,7 +1635,7 @@ class ElectrumWindow(QMainWindow):
if not address: return
try:
pk_list = self.wallet.get_private_key(address, password)
except BaseException, e:
except Exception as e:
self.show_message(str(e))
return
QMessageBox.information(self, _('Private key'), _('Address')+ ': ' + address + '\n\n' + _('Private key') + ': ' + '\n'.join(pk_list), _('OK'))
@@ -1648,7 +1648,7 @@ class ElectrumWindow(QMainWindow):
try:
sig = self.wallet.sign_message(str(address.text()), message, password)
signature.setText(sig)
except BaseException, e:
except Exception as e:
self.show_message(str(e))
def sign_message(self, address):
@@ -1840,7 +1840,7 @@ class ElectrumWindow(QMainWindow):
try:
tx = self.wallet.make_unsigned_transaction(outputs, None, None)
except BaseException, e:
except Exception as e:
self.show_message(str(e))
return
@@ -1893,7 +1893,7 @@ class ElectrumWindow(QMainWindow):
export_error_label = _("Electrum was unable to produce a private key-export.")
QMessageBox.critical(None, _("Unable to create csv"), export_error_label + "\n" + str(reason))
except BaseException, e:
except Exception as e:
self.show_message(str(e))
return
@@ -1946,7 +1946,7 @@ class ElectrumWindow(QMainWindow):
for key in text:
try:
addr = self.wallet.import_key(key, password)
except BaseException as e:
except Exception as e:
badkeys.append(key)
continue
if not addr:

2
gui/stdio.py
View File

@@ -198,7 +198,7 @@ class ElectrumGui:
try:
tx = self.wallet.mktx( [(self.str_recipient, amount)], password, fee)
except BaseException, e:
except Exception as e:
print(str(e))
return

2
gui/text.py
View File

@@ -309,7 +309,7 @@ class ElectrumGui:
try:
tx = self.wallet.mktx( [(self.str_recipient, amount)], password, fee)
except BaseException, e:
except Exception as e:
self.show_message(str(e))
return