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

Enforce order also on multiple room descs

Browse source
This commit is contained in:
Griatch 2023-06-08 15:23:57 +02:00
parent 2ac1f88ad9
commit 18569482f1
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
evennia/contrib/grid/extended_room/extended_room.py
View file

@ -345,7 +345,7 @@ class ExtendedRoom(DefaultRoom):
**{None: self.db.desc or ""}, **{None: self.db.desc or ""},
**{ **{
attr.key[5:]: attr.value attr.key[5:]: attr.value
for attr in self.db_attributes.filter(db_key__startswith="desc_") for attr in self.db_attributes.filter(db_key__startswith="desc_").order_by("db_key")
}, },
} }

6
evennia/contrib/grid/extended_room/tests.py
View file

@ -219,12 +219,12 @@ Base room description.
f""" f"""
Room Room(#{self.room1.id}) Season: autumn. Time: afternoon. States: None Room Room(#{self.room1.id}) Season: autumn. Time: afternoon. States: None
Room state spring:
Spring description.
Room state burning: Room state burning:
Burning description. Burning description.
Room state spring:
Spring description.
Room state (default) (active): Room state (default) (active):
Base room description. Base room description.
""".strip(), """.strip(),

4
evennia/objects/tests.py
View file

@ -370,8 +370,8 @@ class TestProperties(EvenniaTestCase):
# add extra tag to category # add extra tag to category
obj.tags.add("category_tag2", category="tagcategory1") obj.tags.add("category_tag2", category="tagcategory1")
self.assertEqual( self.assertEqual(
obj.tags.get(category="tagcategory1"), set(obj.tags.get(category="tagcategory1")),
["category_tag1", "category_tag2"], set(["category_tag1", "category_tag2"]),
) )
self.assertEqual(set(obj.tagcategory1), set(["category_tag1", "category_tag2"])) self.assertEqual(set(obj.tagcategory1), set(["category_tag1", "category_tag2"]))