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

Make INLINEFUNC_STACK_MAXSIZE default visible in settings_default. Resolves #2173.

Browse source
This commit is contained in:
Griatch 2020-07-19 10:30:30 +02:00
parent f615886d24
commit fa09aeef50
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -67,6 +67,7 @@ without arguments starts a full interactive Python console.
- Make CmdGet/Drop/Give give proper error if `obj.move_to` returns `False`. - Make CmdGet/Drop/Give give proper error if `obj.move_to` returns `False`.
- Make `Object/Room/Exit.create`'s `account` argument optional. If not given, will set perms - Make `Object/Room/Exit.create`'s `account` argument optional. If not given, will set perms
to that of the object itself (along with normal Admin/Dev permission). to that of the object itself (along with normal Admin/Dev permission).
- Make `INLINEFUNC_STACK_MAXSIZE` default visible in `settings_default.py`.
## Evennia 0.9 (2018-2019) ## Evennia 0.9 (2018-2019)

7
evennia/settings_default.py
View file

@ -583,12 +583,15 @@ TIME_IGNORE_DOWNTIMES = False
# session-aware text formatting and manipulation on the fly. If # session-aware text formatting and manipulation on the fly. If
# disabled, such inline functions will not be parsed. # disabled, such inline functions will not be parsed.
INLINEFUNC_ENABLED = False INLINEFUNC_ENABLED = False
# This defined how deeply nested inlinefuncs can be. Set to <=0 to
# disable (not recommended, this is a safeguard against infinite loops).
INLINEFUNC_STACK_MAXSIZE = 20
# Only functions defined globally (and not starting with '_') in # Only functions defined globally (and not starting with '_') in
# these modules will be considered valid inlinefuncs. The list # these modules will be considered valid inlinefuncs. The list
# is loaded from left-to-right, same-named functions will overload # is loaded from left-to-right, same-named functions will overload
INLINEFUNC_MODULES = ["evennia.utils.inlinefuncs", "server.conf.inlinefuncs"] INLINEFUNC_MODULES = ["evennia.utils.inlinefuncs", "server.conf.inlinefuncs"]
# Module holding handlers for OLCFuncs. These allow for embedding # Module holding handlers for ProtFuncs. These allow for embedding
# functional code in prototypes # functional code in prototypes and has the same syntax as inlinefuncs.
PROTOTYPEFUNC_MODULES = ["evennia.utils.prototypefuncs", "server.conf.prototypefuncs"] PROTOTYPEFUNC_MODULES = ["evennia.utils.prototypefuncs", "server.conf.prototypefuncs"]
###################################################################### ######################################################################

9
evennia/utils/inlinefuncs.py
View file

@ -67,6 +67,9 @@ from django.conf import settings
from evennia.utils import utils, logger from evennia.utils import utils, logger
# The stack size is a security measure. Set to <=0 to disable.
_STACK_MAXSIZE = settings.INLINEFUNC_STACK_MAXSIZE
# example/testing inline functions # example/testing inline functions
@ -276,12 +279,6 @@ for module in utils.make_iter(settings.INLINEFUNC_MODULES):
raise raise
# The stack size is a security measure. Set to <=0 to disable.
try:
_STACK_MAXSIZE = settings.INLINEFUNC_STACK_MAXSIZE
except AttributeError:
_STACK_MAXSIZE = 20
# regex definitions # regex definitions
_RE_STARTTOKEN = re.compile(r"(?<!\\)\$(\w+)\(") # unescaped $funcname( (start of function call) _RE_STARTTOKEN = re.compile(r"(?<!\\)\$(\w+)\(") # unescaped $funcname( (start of function call)