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

Handle spawned attrs with dict, as per #1787

Browse source
This commit is contained in:
Griatch 2019-06-09 18:03:53 +02:00
parent e9df197385
commit 5f8e08ecaf
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
evennia/prototypes/menus.py
View file

@ -106,7 +106,7 @@ def _format_option_value(prop, required=False, prototype=None, cropper=None):
if utils.is_iter(prop): if utils.is_iter(prop):
out = ", ".join(str(pr) for pr in prop) out = ", ".join(str(pr) for pr in prop)
if not out and required: if not out and required:
out = "|rreqrd" out = "|runset"
if out: if out:
return " ({}|n)".format(cropper(out) if cropper else utils.crop(out, _MENU_CROP_WIDTH)) return " ({}|n)".format(cropper(out) if cropper else utils.crop(out, _MENU_CROP_WIDTH))
return "" return ""

2
evennia/prototypes/prototypes.py
View file

@ -739,7 +739,7 @@ def init_spawn_value(value, validator=None):
validator = validator if validator else lambda o: o validator = validator if validator else lambda o: o
if callable(value): if callable(value):
value = validator(value()) value = validator(value())
elif value and is_iter(value) and callable(value[0]): elif value and isinstance(value, (list, tuple)) and callable(value[0]):
# a structure (callable, (args, )) # a structure (callable, (args, ))
args = value[1:] args = value[1:]
value = validator(value[0](*make_iter(args))) value = validator(value[0](*make_iter(args)))