tMerge pull request #2644 from jrjackso/fix-commands - electrum - Electrum Bitcoin wallet HTML git clone https://git.parazyd.org/electrum DIR Log DIR Files DIR Refs DIR Submodules --- DIR commit cefb1c9bc0fdfc808248d1715a5afa339871dec1 DIR parent c5d3adcf32c5148c9890dbcb68bfab663e554b7c HTML Author: ThomasV <thomasv@electrum.org> Date: Sat, 29 Jul 2017 06:33:49 +0200 Merge pull request #2644 from jrjackso/fix-commands Fixes issue calling commands that do not require a password, such as help Diffstat: M lib/commands.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) --- DIR diff --git a/lib/commands.py b/lib/commands.py t@@ -101,7 +101,11 @@ class Commands: if password is None: return f = getattr(self, method) - result = f(*args, **{'password':password}) + if cmd.requires_password: + result = f(*args, **{'password':password}) + else: + result = f(*args) + if self._callback: apply(self._callback, ()) return result