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

run black, case-insensitive regex

Browse source
This commit is contained in:
Cal 2024-05-15 15:19:14 -06:00
parent 1c038a030d
commit 5f699ce312
2 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
evennia/objects/manager.py
View file

@ -331,8 +331,8 @@ class ObjectDBManager(TypedObjectManager):
cand_restriction cand_restriction
& type_restriction & type_restriction
& ( & (
Q(db_key__regex=search_regex) Q(db_key__iregex=search_regex)
| Q(db_tags__db_key__regex=search_regex) | Q(db_tags__db_key__iregex=search_regex)
& Q(db_tags__db_tagtype__iexact="alias") & Q(db_tags__db_tagtype__iexact="alias")
) )
) )

15
evennia/objects/tests.py
View file

@ -267,7 +267,7 @@ class TestObjectManager(BaseEvenniaTest):
query = ObjectDB.objects.get_objs_with_key_or_alias("") query = ObjectDB.objects.get_objs_with_key_or_alias("")
self.assertFalse(query) self.assertFalse(query)
query = ObjectDB.objects.get_objs_with_key_or_alias("", exact=False) query = ObjectDB.objects.get_objs_with_key_or_alias("", exact=False)
self.assertEqual(list(query), list(ObjectDB.objects.all())) self.assertEqual(list(query), list(ObjectDB.objects.all().order_by('id')))
query = ObjectDB.objects.get_objs_with_key_or_alias( query = ObjectDB.objects.get_objs_with_key_or_alias(
"", exact=False, typeclasses="evennia.objects.objects.DefaultCharacter" "", exact=False, typeclasses="evennia.objects.objects.DefaultCharacter"
@ -278,18 +278,17 @@ class TestObjectManager(BaseEvenniaTest):
self.char1.tags.add("test tag") self.char1.tags.add("test tag")
self.obj1.tags.add("test tag") self.obj1.tags.add("test tag")
query = ObjectDB.objects.search_object( query = ObjectDB.objects.search_object("", exact=False, tags=[("test tag", None)])
"", exact=False, tags=[('test tag', None)]
)
self.assertEqual(list(query), [self.obj1, self.char1]) self.assertEqual(list(query), [self.obj1, self.char1])
query = ObjectDB.objects.search_object( query = ObjectDB.objects.search_object("Char", tags=[("invalid tag", None)])
"Char", tags=[('invalid tag', None)]
)
self.assertFalse(query) self.assertFalse(query)
query = ObjectDB.objects.search_object( query = ObjectDB.objects.search_object(
"", exact=False, tags=[('test tag', None)], typeclass="evennia.objects.objects.DefaultCharacter" "",
exact=False,
tags=[("test tag", None)],
typeclass="evennia.objects.objects.DefaultCharacter",
) )
self.assertEqual(list(query), [self.char1]) self.assertEqual(list(query), [self.char1])