Merge branch 'master' of gitorious.org:electrum/electrum

This commit is contained in:
ThomasV 2012-02-21 18:06:58 +03:00
commit 3162edb18f
1 changed files with 1 additions and 0 deletions

View File

@ -287,6 +287,7 @@ class Wallet:
def import_key(self, keypair, password): def import_key(self, keypair, password):
address, key = keypair.split(':') address, key = keypair.split(':')
if not self.is_valid(address): return False if not self.is_valid(address): return False
if address in self.all_addresses(): return False
b = ASecretToSecret( key ) b = ASecretToSecret( key )
if not b: return False if not b: return False
secexp = int( b.encode('hex'), 16) secexp = int( b.encode('hex'), 16)