From bfec5c3a37fcab8ef12bb6eef05f847c2a7261e1 Mon Sep 17 00:00:00 2001 From: Griatch Date: Sun, 29 Sep 2024 14:46:18 +0200 Subject: [PATCH] Revert ac06ff735 since it caused unexpected side effects --- evennia/prototypes/prototypes.py | 1 - evennia/typeclasses/tags.py | 13 +++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/evennia/prototypes/prototypes.py b/evennia/prototypes/prototypes.py index a6aca98009..569179817f 100644 --- a/evennia/prototypes/prototypes.py +++ b/evennia/prototypes/prototypes.py @@ -627,7 +627,6 @@ def search_prototype( if key: # exact or partial match on key - key = str(key).strip().lower() exact_match = query.filter(Q(db_key__iexact=key)) if not exact_match and fuzzy_matching: # try with partial match instead diff --git a/evennia/typeclasses/tags.py b/evennia/typeclasses/tags.py index f8127c028a..b396419a4b 100644 --- a/evennia/typeclasses/tags.py +++ b/evennia/typeclasses/tags.py @@ -14,6 +14,7 @@ from collections import defaultdict from django.conf import settings from django.db import models + from evennia.locks.lockfuncs import perm as perm_lockfunc from evennia.utils.utils import make_iter, to_str @@ -591,10 +592,8 @@ class TagHandler(object): """ ret = [] - category = category.strip().lower() if category is not None else None for keystr in make_iter(key): # note - the _getcache call removes case sensitivity for us - keystr = str(keystr).strip().lower() ret.extend( [ tag if return_tagobj else to_str(tag.db_key) @@ -633,7 +632,7 @@ class TagHandler(object): if not (key or key.strip()): # we don't allow empty tags continue tagstr = str(key).strip().lower() - category = str(category).strip().lower() if category else category + category = category.strip().lower() if category else category # This does not delete the tag object itself. Maybe it should do # that when no objects reference the tag anymore (but how to check)? @@ -663,7 +662,7 @@ class TagHandler(object): "tag__db_tagtype": self._tagtype, } if category: - query["tag__db_category"] = str(category).strip().lower() + query["tag__db_category"] = category.strip().lower() getattr(self.obj, self._m2m_fieldname).through.objects.filter(**query).delete() self._cache = {} self._catcache = {} @@ -728,7 +727,7 @@ class TagHandler(object): keys[tup[1]].append(tup[0]) data[tup[1]] = tup[2] # overwrite previous for category, key in keys.items(): - self.add(key=str(key).strip().lower(), category=category, data=data.get(category, None)) + self.add(key=key, category=category, data=data.get(category, None)) def batch_remove(self, *args): """ @@ -749,9 +748,7 @@ class TagHandler(object): elif nlen > 1: keys[tup[1]].append(tup[0]) for category, key in keys.items(): - self.remove( - key=str(key).strip().lower(), category=category, data=data.get(category, None) - ) + self.remove(key=key, category=category, data=data.get(category, None)) def __str__(self): return ",".join(self.all())