commit edf293e61195cca57a0805a1f9b16404b46c3dc9
parent 26c0b786e9c2c1996b22c68ccacae27fd0aaf27a
Author: Jimbo77 <onlineregular@gmail.com>
Date: Sat, 25 Aug 2012 14:11:50 -0700
reverted commit 31aaf473c81a7358eb711c3117d396b218f11ff1 due to it breaking electrum
Diffstat:
M | electrum | | | 27 | ++++++++++++++------------- |
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/electrum b/electrum
@@ -18,7 +18,8 @@
import re
import sys
-import argparse
+# import argparse
+import optparse
try:
from lib.util import print_error
@@ -101,18 +102,18 @@ protected_commands = ['payto', 'password', 'mktx', 'seed', 'import','signmessage
if __name__ == '__main__':
usage = "usage: %prog [options] command\nCommands: "+ (', '.join(known_commands))
- parser = argparse.ArgumentParser(prog=usage)
- parser.add_argument("-g", "--gui", dest="gui", default="lite", help="gui")
- parser.add_argument("-w", "--wallet", dest="wallet_path", help="wallet path (default: electrum.dat)")
- parser.add_argument("-o", "--offline", action="store_true", dest="offline", default=False, help="remain offline")
- parser.add_argument("-a", "--all", action="store_true", dest="show_all", default=False, help="show all addresses")
- parser.add_argument("-b", "--balance", action="store_true", dest="show_balance", default=False, help="show the balance at listed addresses")
- parser.add_argument("-k", "--keys",action="store_true", dest="show_keys",default=False, help="show the private keys of listed addresses")
- parser.add_argument("-f", "--fee", dest="tx_fee", default="0.005", help="set tx fee")
- parser.add_argument("-s", "--fromaddr", dest="from_addr", default=None, help="set source address for payto/mktx. if it isn't in the wallet, it will ask for the private key unless supplied in the format public_key:private_key. It's not saved in the wallet.")
- parser.add_argument("-c", "--changeaddr", dest="change_addr", default=None, help="set the change address for payto/mktx. default is a spare address, or the source address if it's not in the wallet")
- parser.add_argument("-r", "--remote", dest="remote_url", default=None, help="URL of a remote wallet")
- args = parser.parse_args()
+ parser = OptionParser(prog=usage)
+ parser.add_option("-g", "--gui", dest="gui", default="lite", help="gui")
+ parser.add_option("-w", "--wallet", dest="wallet_path", help="wallet path (default: electrum.dat)")
+ parser.add_option("-o", "--offline", action="store_true", dest="offline", default=False, help="remain offline")
+ parser.add_option("-a", "--all", action="store_true", dest="show_all", default=False, help="show all addresses")
+ parser.add_option("-b", "--balance", action="store_true", dest="show_balance", default=False, help="show the balance at listed addresses")
+ parser.add_option("-k", "--keys",action="store_true", dest="show_keys",default=False, help="show the private keys of listed addresses")
+ parser.add_option("-f", "--fee", dest="tx_fee", default="0.005", help="set tx fee")
+ parser.add_option("-s", "--fromaddr", dest="from_addr", default=None, help="set source address for payto/mktx. if it isn't in the wallet, it will ask for the private key unless supplied in the format public_key:private_key. It's not saved in the wallet.")
+ parser.add_option("-c", "--changeaddr", dest="change_addr", default=None, help="set the change address for payto/mktx. default is a spare address, or the source address if it's not in the wallet")
+ parser.add_option("-r", "--remote", dest="remote_url", default=None, help="URL of a remote wallet")
+ options, args = parser.parse_args()
wallet = Wallet()
wallet.set_path(options.wallet_path)