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

Resolve merge conflicts

Browse source
This commit is contained in:
Griatch 2020-07-18 15:56:47 +02:00
commit 862d2a5d06
9 changed files with 228 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

4
evennia/server/sessionhandler.py
View file

@ -203,7 +203,9 @@ class SessionHandler(dict):
elif isinstance(data, (str, bytes)):
data = _utf8(data)
if _INLINEFUNC_ENABLED and not raw and isinstance(self, ServerSessionHandler):
if (_INLINEFUNC_ENABLED
and not raw
and isinstance(self, ServerSessionHandler)):
# only parse inlinefuncs on the outgoing path (sessionhandler->)
data = parse_inlinefunc(data, strip=strip_inlinefunc, session=session)