From bdf86b203d98ec97ff2f08afd697d9476823e6f3 Mon Sep 17 00:00:00 2001 From: Griatch Date: Sun, 26 Feb 2012 12:07:25 +0100 Subject: [PATCH] Reverting caching-changes to cmdset_storage, causes spurious errors. --- src/objects/models.py | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/objects/models.py b/src/objects/models.py index f971e3c786..6005f6ce06 100644 --- a/src/objects/models.py +++ b/src/objects/models.py @@ -379,31 +379,22 @@ class ObjectDB(TypedObject): #@property def cmdset_storage_get(self): "Getter. Allows for value = self.name. Returns a list of cmdset_storage." - try: - return get_cache(self, "cmdset_storage") - except AttributeError: - cstorage = [path.strip() for path in self.db_cmdset_storage.split(',')] - SA(self, "_cached_db_cmdset_storage", cstorage) - return cstorage + if self.db_cmdset_storage: + return [path.strip() for path in self.db_cmdset_storage.split(',')] return [] #@cmdset_storage.setter def cmdset_storage_set(self, value): "Setter. Allows for self.name = value. Stores as a comma-separated string." - value = ",".join(str(val).strip() for val in make_iter(value)) - SA(self, "db_cmdset_storate", value) - GA(self, "save")() - value = [path for path in value.split(',')] - SA(self, "_cached_db_cmdset_storage", value) - + value = ",".join(str(val).strip() for val in make_iter(value)) + self.db_cmdset_storage = value + self.save() #@cmdset_storage.deleter def cmdset_storage_del(self): "Deleter. Allows for del self.name" self.db_cmdset_storage = "" self.save() - del_cache(self, "cmdset_storage") cmdset_storage = property(cmdset_storage_get, cmdset_storage_set, cmdset_storage_del) - class Meta: "Define Django meta options" verbose_name = "Object"