Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-04-01 21:47:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed more cleanup of Attibute/Tag/Nick/Permission handlers when object is deleted.

Browse source
This commit is contained in:
Griatch 2014-04-20 16:47:03 +02:00
parent f521b8129e
commit 972e47e66c
2 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/typeclasses/models.py
View file

@ -353,10 +353,13 @@ class AttributeHandler(object):
given, check the 'attredit' lock on each Attribute before
continuing. If not given, skip check.
"""
for attr in self.all(category=category, accessing_obj=accessing_obj, default_access=default_access):
if accessing_obj and not attr.access(accessing_obj, self._attredit, default=default_access):
continue
attr.delete()
if self._cache is None or not _TYPECLASS_AGGRESSIVE_CACHE:
self._recache()
if accessing_obj:
[attr.delete() for attr in self._cache.values()
if attr.access(accessing_obj, self._attredit, default=default_access)]
else:
[attr.delete() for attr in self._cache.values()]
self._recache()
def all(self, accessing_obj=None, default_access=True):
@ -369,7 +372,11 @@ class AttributeHandler(object):
"""
if self._cache is None or not _TYPECLASS_AGGRESSIVE_CACHE:
self._recache()
return self._cache.values()
if accessing_obj:
return [attr for attr in self._cache.values()
if attr.access(accessing_obj, self._attredit, default=default_access)]
else:
return self._cache.values()
class NickHandler(AttributeHandler):
"""
@ -1121,6 +1128,14 @@ class TypedObject(SharedMemoryModel):
if hperm in perms and hpos > ppos)
return False
def delete(self):
"Cleaning up handlers on the typeclass level"
_GA(self, "attributes").clear()
_GA(self, "nicks").clear()
_GA(self, "aliases").clear()
_GA(self, "permissions").clear()
super(TypedObject, self).delete()
#
# Memory management
#