tmake help() available in console - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit e16451556ebfb6cdb9e0e646f78b7c893e2c5e56
DIR parent 527ba99ef227167268f5f730c739a9b77f66b864
HTML Author: ecdsa <ecdsa@github>
Date: Mon, 4 Mar 2013 17:36:49 +0100
make help() available in console
Diffstat:
M electrum | 30 +++++++++---------------------
M gui/qt_console.py | 5 -----
M lib/commands.py | 10 ++++++++++
3 files changed, 19 insertions(+), 26 deletions(-)
---
DIR diff --git a/electrum b/electrum
t@@ -113,7 +113,6 @@ if __name__ == '__main__':
cmd = 'gui'
else:
cmd = args[0]
- firstarg = args[1] if len(args) > 1 else ''
if cmd == 'gui':
t@@ -318,12 +317,18 @@ if __name__ == '__main__':
elif cmd == 'createrawtransaction':
args = [ cmd, json.loads(args[1]), json.loads(args[2])]
- elif cmd=='listaddresses':
+ elif cmd == 'listaddresses':
args = [cmd, options.show_all, options.show_balance, options.show_labels]
elif cmd in ['payto', 'mktx']:
args = [ 'mktx', args[1], Decimal(args[2]), Decimal(options.tx_fee) if options.tx_fee else None, options.change_addr, options.from_addr ]
+ elif cmd == 'help':
+ if len(args) < 2:
+ parser.print_help()
+ print_msg("Type 'electrum help <command>' to see the help for a specific command")
+ print_msg("Type 'electrum --help' to see the list of options")
+
t@@ -349,8 +354,6 @@ if __name__ == '__main__':
-
-
# open session
if cmd not in offline_commands and not options.offline:
interface = Interface(config)
t@@ -366,20 +369,8 @@ if __name__ == '__main__':
# run the command
- if cmd == 'help':
- cmd2 = firstarg
- if cmd2 not in known_commands:
- parser.print_help()
- print_msg("Type 'electrum help <command>' to see the help for a specific command")
- print_msg("Type 'electrum --help' to see the list of options")
- print_msg("List of commands:", ', '.join(known_commands))
- else:
- _, _, description, syntax, options_syntax = known_commands[cmd2]
- print_msg(description)
- if syntax: print_msg("Syntax: " + syntax)
- if options_syntax: print_msg("options:\n" + options_syntax)
- elif cmd == 'deseed':
+ if cmd == 'deseed':
if not wallet.seed:
print_msg("Error: This wallet has no seed")
else:
t@@ -412,13 +403,10 @@ if __name__ == '__main__':
else:
print_msg(False)
-
elif cmd == 'password':
new_password = prompt_password('New password:')
wallet.update_password(seed, password, new_password)
-
-
else:
cmd_runner = Commands(wallet, interface)
func = eval('cmd_runner.' + cmd)
t@@ -431,7 +419,7 @@ if __name__ == '__main__':
if type(result) == str:
util.print_msg(result)
- else:
+ elif result is not None:
util.print_json(result)
DIR diff --git a/gui/qt_console.py b/gui/qt_console.py
t@@ -191,11 +191,6 @@ class Console(QtGui.QPlainTextEdit):
QtCore.QCoreApplication.processEvents()
self.skip = not self.skip
- if command == 'help()':
- self.appendPlainText("no help here!")
- self.newPrompt()
- return
-
sys.stdout = stdoutProxy(self.appendPlainText)
try:
try:
DIR diff --git a/lib/commands.py b/lib/commands.py
t@@ -296,4 +296,14 @@ class Commands:
out.append( item )
return out
+ def help(self, cmd2=None):
+ if cmd2 not in known_commands:
+ print_msg("List of commands:", ', '.join(known_commands))
+ else:
+ _, _, description, syntax, options_syntax = known_commands[cmd2]
+ print_msg(description)
+ if syntax: print_msg("Syntax: " + syntax)
+ if options_syntax: print_msg("options:\n" + options_syntax)
+ return None
+