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

10
lib/commands.py
View File

@@ -228,7 +228,7 @@ class Commands:
try:
addr = self.wallet.import_key(sec,self.password)
out = "Keypair imported: ", addr
except BaseException as e:
except Exception as e:
out = "Error: Keypair import failed: " + str(e)
return out
@@ -245,19 +245,19 @@ class Commands:
for to_address, amount in outputs:
if not is_valid(to_address):
raise BaseException("Invalid Bitcoin address", to_address)
raise Exception("Invalid Bitcoin address", to_address)
if change_addr:
if not is_valid(change_addr):
raise BaseException("Invalid Bitcoin address", change_addr)
raise Exception("Invalid Bitcoin address", change_addr)
if domain is not None:
for addr in domain:
if not is_valid(addr):
raise BaseException("invalid Bitcoin address", addr)
raise Exception("invalid Bitcoin address", addr)
if not self.wallet.is_mine(addr):
raise BaseException("address not in wallet", addr)
raise Exception("address not in wallet", addr)
for k, v in self.wallet.labels.items():
if change_addr and v == change_addr: