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

Fixed a lingering call to the old caching scheme by swap_typeclass method. Resolves Issue 332.

Browse source
This commit is contained in:
Griatch 2012-11-13 21:34:42 +01:00
parent 28c625c12c
commit 8f4f123230
1 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/typeclasses/models.py
View file

@ -1241,24 +1241,20 @@ class TypedObject(SharedMemoryModel):
# this is an actual class object - build the path # this is an actual class object - build the path
cls = new_typeclass.__class__ cls = new_typeclass.__class__
new_typeclass = "%s.%s" % (cls.__module__, cls.__name__) new_typeclass = "%s.%s" % (cls.__module__, cls.__name__)
else:
new_typeclass = "%s" % to_str(new_typeclass)
# Try to set the new path # Try to set the new path
# this will automatically save to database # this will automatically save to database
old_typeclass_path = self.typeclass_path old_typeclass_path = self.typeclass_path
self.typeclass_path = new_typeclass.strip() _SA(self, "typeclass_path", new_typeclass.strip())
# this will automatically use a default class if # this will automatically use a default class if
# there is an error with the given typeclass. # there is an error with the given typeclass.
new_typeclass = self.typeclass new_typeclass = self.typeclass
if self.typeclass_path == new_typeclass.path: if self.typeclass_path != new_typeclass.path and no_default:
# the typeclass loading worked as expected
_DA(self, "_cached_db_typeclass_path")
_SA(self, "_cached_typeclass", None)
elif no_default:
# something went wrong; the default was loaded instead, # something went wrong; the default was loaded instead,
# and we don't allow that; instead we return to previous. # and we don't allow that; instead we return to previous.
_SA(self, "typeclass_path", old_typeclass_path) _SA(self, "typeclass_path", old_typeclass_path)
_SA(self, "_cached_typeclass", None)
return False return False
if clean_attributes: if clean_attributes: