From c6b71f1a0de85a896fe09da0bd90f2366e223c84 Mon Sep 17 00:00:00 2001 From: Ethan Dalool Date: Sun, 6 May 2018 20:58:51 -0700 Subject: [PATCH] Revert caching of qualified names. Causing too many problems. The world is just not ready for it. Was having issues about the parents being deleted / renamed and needing to propogate those changes in a not-ugly way. Will reassess in the future. --- etiquette/objects.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/etiquette/objects.py b/etiquette/objects.py index e8579c2..6941b48 100644 --- a/etiquette/objects.py +++ b/etiquette/objects.py @@ -1157,7 +1157,6 @@ class Tag(ObjectBase, GroupableMixin): self.group_getter = self.photodb.get_tag self.group_getter_many = self.photodb.get_tags_by_id - self._cached_qualified_name = None def __eq__(self, other): return self.name == other or ObjectBase.__eq__(self, other) @@ -1207,7 +1206,6 @@ class Tag(ObjectBase, GroupableMixin): def _uncache(self): self.photodb.caches['tag'].remove(self.id) - self._cached_qualified_name = None @decorators.required_feature('tag.edit') # GroupableMixin.add_child already has @transaction. @@ -1379,15 +1377,11 @@ class Tag(ObjectBase, GroupableMixin): if len(self.name) > max_len: return self.name[:max_len] - if self._cached_qualified_name: - qualname = self._cached_qualified_name + parent = self.get_parent() + if parent is None: + qualname = self.name else: - parent = self.get_parent() - if parent is None: - qualname = self.name - else: - qualname = parent.qualified_name() + '.' + self.name - self._cached_qualified_name = qualname + qualname = parent.qualified_name() + '.' + self.name if max_len is None or len(qualname) <= max_len: return qualname @@ -1441,7 +1435,6 @@ class Tag(ObjectBase, GroupableMixin): else: raise exceptions.TagExists(new_name) - self._cached_qualified_name = None self.photodb._cached_frozen_children = None data = {