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

Refactor code to remove alerts as per lgtm and #1176.

Browse source
This commit is contained in:
Griatch 2017-01-29 19:02:00 +01:00
parent dcde526f6d
commit 74eebfed6d
54 changed files with 226 additions and 264 deletions
Download patch file Download diff file Expand all files Collapse all files

20
evennia/server/inputfuncs.py
View file

@ -56,28 +56,28 @@ def text(session, *args, **kwargs):
#from evennia.server.profiling.timetrace import timetrace
#text = timetrace(text, "ServerSession.data_in")
text = args[0] if args else None
txt = args[0] if args else None
#explicitly check for None since text can be an empty string, which is
#also valid
if text is None:
if txt is None:
return
# this is treated as a command input
# handle the 'idle' command
if text.strip() in _IDLE_COMMAND:
if txt.strip() in _IDLE_COMMAND:
session.update_session_counters(idle=True)
return
if session.player:
# nick replacement
puppet = session.puppet
if puppet:
text = puppet.nicks.nickreplace(text,
txt = puppet.nicks.nickreplace(txt,
categories=("inputline", "channel"), include_player=True)
else:
text = session.player.nicks.nickreplace(text,
txt = session.player.nicks.nickreplace(txt,
categories=("inputline", "channel"), include_player=False)
kwargs.pop("options", None)
cmdhandler(session, text, callertype="session", session=session, **kwargs)
cmdhandler(session, txt, callertype="session", session=session, **kwargs)
session.update_session_counters()
@ -92,20 +92,20 @@ def bot_data_in(session, *args, **kwargs):
"""
text = args[0] if args else None
txt = args[0] if args else None
# Explicitly check for None since text can be an empty string, which is
# also valid
if text is None:
if txt is None:
return
# this is treated as a command input
# handle the 'idle' command
if text.strip() in _IDLE_COMMAND:
if txt.strip() in _IDLE_COMMAND:
session.update_session_counters(idle=True)
return
kwargs.pop("options", None)
# Trigger the execute_cmd method of the corresponding bot.
session.player.execute_cmd(text=text, session=session)
session.player.execute_cmd(text=txt, session=session)
session.update_session_counters()