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

Use parse_to_any, for protfuncs, handle empty list in $choice funcparser func

Browse source
This commit is contained in:
Griatch 2022-10-05 22:25:46 +02:00
parent d3fe999c4b
commit 6e45ac0cb1
2 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
evennia/prototypes/prototypes.py
View file

@ -132,7 +132,7 @@ def homogenize_prototype(prototype, custom_keys=None):
# attrs must be on form [(key, value, category, lockstr)]
if not is_iter(attr):
logger.log_error(
"Prototype's 'attr' field must " f"be a list of tuples: {prototype}"
f"Prototype's 'attr' field must be a list of tuples: {prototype}"
)
elif attr:
nattr = len(attr)
@ -237,8 +237,7 @@ def load_module_prototypes(*mod_or_prototypes, override=True):
for prot in prototype_list:
if not isinstance(prot, dict):
logger.log_err(
f"Prototype read from {mod}.PROTOTYPE_LIST "
f"is not a dict (skipping): {prot}"
f"Prototype read from {mod}.PROTOTYPE_LIST is not a dict (skipping): {prot}"
)
continue
elif "prototype_key" not in prot:
@ -823,7 +822,7 @@ def validate_prototype(
if strict and not (typeclass or prototype_parent):
if is_prototype_base:
_flags["errors"].append(
_("Prototype {protkey} requires `typeclass` " "or 'prototype_parent'.").format(
_("Prototype {protkey} requires `typeclass` or 'prototype_parent'.").format(
protkey=protkey
)
)
@ -866,8 +865,7 @@ def validate_prototype(
if not protparent:
_flags["errors"].append(
_(
"Prototype {protkey}'s `prototype_parent` (named '{parent}') "
"was not found."
"Prototype {protkey}'s `prototype_parent` (named '{parent}') was not found."
).format(protkey=protkey, parent=protstring)
)
@ -959,7 +957,7 @@ def protfunc_parser(
if not isinstance(value, str):
return value
result = FUNC_PARSER.parse(value, raise_errors=True, return_str=False, caller=caller, **kwargs)
result = FUNC_PARSER.parse_to_any(value, raise_errors=True, caller=caller, **kwargs)
return result