electrum

commit 2a08145faf0e93a3d13b79c92dd285950974fa59
parent 73c8905c76d185dc78921a332c36b130a247cf92
Author: ThomasV <thomasv@gitorious>
Date:   Sun, 19 Feb 2012 23:06:05 +0300

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

Diffstat:
M
client/electrum
 | 
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/client/electrum b/client/electrum
@@ -19,7 +19,7 @@
 import re, sys, getpass
 
 from optparse import OptionParser
-from wallet import Wallet
+from wallet import Wallet, SecretToASecret
 from interface import Interface
 from decimal import Decimal
 
@@ -270,7 +270,7 @@ if __name__ == '__main__':
                     b = "%d %d %s"%(no, ni, str(Decimal(wallet.get_addr_balance(addr)[0])/100000000))
                 else: b=''
                 if options.show_keys:
-                    pk = wallet.get_private_key2(addr, password)
+                    pk = wallet.get_private_key(addr, password)
                     addr = addr + ':' + SecretToASecret(pk)
                 print addr, b, _type, label