tclose #4102 close #3337 - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit a048a00594f00da0cd800b9b25a8a2cde341db1e
DIR parent d3065f73bf01a86dc50d902f0a118af4710e802d
HTML Author: SomberNight <somber.night@protonmail.com>
Date: Mon, 12 Mar 2018 04:00:27 +0100
close #4102
close #3337
Diffstat:
M lib/storage.py | 4 +++-
M lib/wallet.py | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
---
DIR diff --git a/lib/storage.py b/lib/storage.py
t@@ -51,6 +51,8 @@ FINAL_SEED_VERSION = 16 # electrum >= 2.7 will set this to prevent
def multisig_type(wallet_type):
'''If wallet_type is mofn multi-sig, return [m, n],
otherwise return None.'''
+ if not wallet_type:
+ return None
match = re.match('(\d+)of(\d+)', wallet_type)
if match:
match = [int(x) for x in match.group(1, 2)]
t@@ -417,7 +419,7 @@ class WalletStorage(PrintError):
d['seed'] = seed
self.put(key, d)
else:
- raise
+ raise Exception('Unable to tell wallet type. Is this even a wallet file?')
# remove junk
self.put('master_public_key', None)
self.put('master_public_keys', None)
DIR diff --git a/lib/wallet.py b/lib/wallet.py
t@@ -2301,5 +2301,5 @@ class Wallet(object):
return Multisig_Wallet
if wallet_type in wallet_constructors:
return wallet_constructors[wallet_type]
- raise RuntimeError("Unknown wallet type: " + wallet_type)
+ raise RuntimeError("Unknown wallet type: " + str(wallet_type))