Browse Source

getting rid of more unnecessary print_errors()

master
Jimbo77 14 years ago
parent
commit
1429ef71e1
  1. 10
      electrum
  2. 2
      lib/wallet.py

10
electrum

@ -347,17 +347,15 @@ if __name__ == '__main__':
f = open(ns,'r') f = open(ns,'r')
data = f.read() data = f.read()
f.close() f.close()
except: except IOError:
print_error("Error: Seed file not found") sys.exit("Error: Seed file not found")
sys.exit()
try: try:
import ast import ast
d = ast.literal_eval( data ) d = ast.literal_eval( data )
seed = d['seed'] seed = d['seed']
imported_keys = d.get('imported_keys',{}) imported_keys = d.get('imported_keys',{})
except: except IOError:
print_error("Error: Error with seed file") sys.exit("Error: Error with seed file")
sys.exit(1)
mpk = wallet.master_public_key mpk = wallet.master_public_key
wallet.seed = seed wallet.seed = seed

2
lib/wallet.py

@ -351,7 +351,7 @@ class Wallet:
self.interface.poke() self.interface.poke()
def set_path(self, wallet_path): def set_path(self, wallet_path):
'''Set the path of the wallet.''' """Set the path of the wallet."""
if wallet_path is not None: if wallet_path is not None:
self.path = wallet_path self.path = wallet_path
else: else:

Loading…
Cancel
Save