From 5f699ce3120987cb1d64206894fda5f277f02481 Mon Sep 17 00:00:00 2001 From: Cal Date: Wed, 15 May 2024 15:19:14 -0600 Subject: [PATCH] run black, case-insensitive regex --- evennia/objects/manager.py | 4 ++-- evennia/objects/tests.py | 17 ++++++++--------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/evennia/objects/manager.py b/evennia/objects/manager.py index 0679370f4b..aa3034814f 100644 --- a/evennia/objects/manager.py +++ b/evennia/objects/manager.py @@ -331,8 +331,8 @@ class ObjectDBManager(TypedObjectManager): cand_restriction & type_restriction & ( - Q(db_key__regex=search_regex) - | Q(db_tags__db_key__regex=search_regex) + Q(db_key__iregex=search_regex) + | Q(db_tags__db_key__iregex=search_regex) & Q(db_tags__db_tagtype__iexact="alias") ) ) diff --git a/evennia/objects/tests.py b/evennia/objects/tests.py index ddcc78944f..0ac1cfcb05 100644 --- a/evennia/objects/tests.py +++ b/evennia/objects/tests.py @@ -267,7 +267,7 @@ class TestObjectManager(BaseEvenniaTest): query = ObjectDB.objects.get_objs_with_key_or_alias("") self.assertFalse(query) 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( "", exact=False, typeclasses="evennia.objects.objects.DefaultCharacter" @@ -277,19 +277,18 @@ class TestObjectManager(BaseEvenniaTest): def test_search_object(self): self.char1.tags.add("test tag") self.obj1.tags.add("test tag") - - query = ObjectDB.objects.search_object( - "", exact=False, tags=[('test tag', None)] - ) + + query = ObjectDB.objects.search_object("", exact=False, tags=[("test tag", None)]) self.assertEqual(list(query), [self.obj1, self.char1]) - query = ObjectDB.objects.search_object( - "Char", tags=[('invalid tag', None)] - ) + query = ObjectDB.objects.search_object("Char", tags=[("invalid tag", None)]) self.assertFalse(query) 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])