Remove usages of deprecated apply() builtin
This commit is contained in:
@@ -54,10 +54,10 @@ class BaseWizard(object):
|
||||
self.plugin, action = action
|
||||
if self.plugin and hasattr(self.plugin, action):
|
||||
f = getattr(self.plugin, action)
|
||||
apply(f, (self,) + args)
|
||||
f(self, *args)
|
||||
elif hasattr(self, action):
|
||||
f = getattr(self, action)
|
||||
apply(f, args)
|
||||
f(*args)
|
||||
else:
|
||||
raise BaseException("unknown action", action)
|
||||
|
||||
|
||||
@@ -97,7 +97,7 @@ class Commands:
|
||||
# this wrapper is called from the python console
|
||||
cmd = known_commands[method]
|
||||
if cmd.requires_password and self.wallet.has_password():
|
||||
password = apply(password_getter, ())
|
||||
password = password_getter()
|
||||
if password is None:
|
||||
return
|
||||
f = getattr(self, method)
|
||||
@@ -105,9 +105,9 @@ class Commands:
|
||||
result = f(*args, **{'password':password})
|
||||
else:
|
||||
result = f(*args)
|
||||
|
||||
|
||||
if self._callback:
|
||||
apply(self._callback, ())
|
||||
self._callback()
|
||||
return result
|
||||
|
||||
@command('')
|
||||
|
||||
Reference in New Issue
Block a user