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

Fix bug in unittest that would cause occational name collision

Browse source
This commit is contained in:
Griatch 2018-10-07 12:31:43 +02:00
parent 68ff0ac9d6
commit fe14dfddef
4 changed files with 24 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
evennia/prototypes/spawner.py
View file

@ -259,11 +259,11 @@ def prototype_from_object(obj):
if aliases:
prot['aliases'] = aliases
tags = [(tag.db_key, tag.db_category, tag.db_data)
for tag in obj.tags.get(return_tagobj=True, return_list=True) if tag]
for tag in obj.tags.all(return_objs=True)]
if tags:
prot['tags'] = tags
attrs = [(attr.key, attr.value, attr.category, ';'.join(attr.locks.all()))
for attr in obj.attributes.get(return_obj=True, return_list=True) if attr]
for attr in obj.attributes.all()]
if attrs:
prot['attrs'] = attrs
@ -660,6 +660,7 @@ def spawn(*prototypes, **kwargs):
protparents = {prot['prototype_key'].lower(): prot for prot in protlib.search_prototype()}
if not kwargs.get("only_validate"):
# homogenization to be more lenient about prototype format when entering the prototype manually
prototypes = [protlib.homogenize_prototype(prot) for prot in prototypes]
# overload module's protparents with specifically given protparents
@ -714,7 +715,7 @@ def spawn(*prototypes, **kwargs):
val = prot.pop("tags", [])
tags = []
for (tag, category, data) in tags:
for (tag, category, data) in val:
tags.append((init_spawn_value(val, str), category, data))
prototype_key = prototype.get('prototype_key', None)