Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Extended get_input to accept *args & **kwargs

Browse source 
Calling get_input with args and kwargs passes them to the callback function. Does not affect previous use so no changed required to existing code.
This commit is contained in:
CloudKeeper1 2017-04-22 16:01:32 +10:00 • committed by Griatch
parent 7e8e47b3b3
commit 4327bc48d3
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
evennia/utils/evmenu.py
View file

@ -894,9 +894,11 @@ class CmdGetInput(Command):
caller.ndb._getinput._session = self.session caller.ndb._getinput._session = self.session
prompt = caller.ndb._getinput._prompt prompt = caller.ndb._getinput._prompt
args = caller.ndb._getinput._args
kwargs = caller.ndb._getinput._kwargs
result = self.raw_string.strip() # we strip the ending line break caused by sending result = self.raw_string.strip() # we strip the ending line break caused by sending
ok = not callback(caller, prompt, result) ok = not callback(caller, prompt, result, *args, **kwargs)
if ok: if ok:
# only clear the state if the callback does not return # only clear the state if the callback does not return
# anything # anything
@ -930,7 +932,7 @@ class _Prompt(object):
pass pass
def get_input(caller, prompt, callback, session=None): def get_input(caller, prompt, callback, session=None, *args, **kwargs):
""" """
This is a helper function for easily request input from This is a helper function for easily request input from
the caller. the caller.
@ -981,6 +983,8 @@ def get_input(caller, prompt, callback, session=None):
caller.ndb._getinput._callback = callback caller.ndb._getinput._callback = callback
caller.ndb._getinput._prompt = prompt caller.ndb._getinput._prompt = prompt
caller.ndb._getinput._session = session caller.ndb._getinput._session = session
caller.ndb._getinput._args = args
caller.ndb._getinput._kwargs = kwargs
caller.cmdset.add(InputCmdSet) caller.cmdset.add(InputCmdSet)
caller.msg(prompt, session=session) caller.msg(prompt, session=session)