From 3f3d249ed1767b14e1c56ebed889c563a9dc912f Mon Sep 17 00:00:00 2001 From: ThomasV Date: Mon, 9 Oct 2017 11:54:17 +0200 Subject: [PATCH] follow up c810c6a3562dd2f9916006437ff1d6a00c24edf3 --- electrum | 6 ++++-- lib/daemon.py | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/electrum b/electrum index 4676764a..1f853ede 100755 --- a/electrum +++ b/electrum @@ -288,10 +288,12 @@ def run_offline_command(config, config_options): # decode json arguments args = list(map(json_decode, args)) # options - args += [(config_options.get(x) if x in ['password', 'new_password'] else config.get(x)) for x in cmd.options] + kwargs = {} + for x in cmd.options: + kwargs[x] = (config_options.get(x) if x in ['password', 'new_password'] else config.get(x)) cmd_runner = Commands(config, wallet, None) func = getattr(cmd_runner, cmd.name) - result = func(*args) + result = func(*args, **kwargs) # save wallet if wallet: wallet.storage.write() diff --git a/lib/daemon.py b/lib/daemon.py index ac5eadf1..f6bb2542 100644 --- a/lib/daemon.py +++ b/lib/daemon.py @@ -259,10 +259,12 @@ class Daemon(DaemonThread): # decode json arguments args = [json_decode(i) for i in args] # options - args += list(map(lambda x: (config_options.get(x) if x in ['password', 'new_password'] else config.get(x)), cmd.options)) + kwargs = {} + for x in cmd.options: + kwargs[x] = (config_options.get(x) if x in ['password', 'new_password'] else config.get(x)) cmd_runner = Commands(config, wallet, self.network) func = getattr(cmd_runner, cmd.name) - result = func(*args) + result = func(*args, **kwargs) return result def run(self):