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

Deprecation warning: Added combined hook at_access(result, accessing_obj, access_type, **kwargs) to Objects and Players. This hook replaces at_access_failure and at_access_success, which are now both DEPRECATED and will be removed later.

Browse source
This commit is contained in:
Griatch 2014-01-18 23:56:07 +01:00
parent aef7ccec8d
commit 87f3093dac
4 changed files with 60 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/typeclasses/models.py
View file

@ -173,14 +173,17 @@ class Attribute(SharedMemoryModel):
def __unicode__(self):
return u"%s(%s)" % (_GA(self, "db_key"), _GA(self, "id"))
def access(self, accessing_obj, access_type='read', default=False):
def access(self, accessing_obj, access_type='read', default=False, **kwargs):
"""
Determines if another object has permission to access.
accessing_obj - object trying to access this one
access_type - type of access sought
default - what to return if no lock of access_type was found
**kwargs - passed to at_access hook along with result.
"""
return self.locks.check(accessing_obj, access_type=access_type, default=default)
result = self.locks.check(accessing_obj, access_type=access_type, default=default)
self.at_access(result, **kwargs)
return result
def at_set(self, new_value):
"""
@ -1060,19 +1063,21 @@ class TypedObject(SharedMemoryModel):
# Lock / permission methods
#
def access(self, accessing_obj, access_type='read', default=False):
def access(self, accessing_obj, access_type='read', default=False, **kwargs):
"""
Determines if another object has permission to access.
accessing_obj - object trying to access this one
access_type - type of access sought
default - what to return if no lock of access_type was found
**kwargs - this is ignored, but is there to make the api consistent with the
object-typeclass method access, which use it to feed to its hook methods.
"""
return self.locks.check(accessing_obj, access_type=access_type, default=default)
def check_permstring(self, permstring):
"""
This explicitly checks if we hold particular permission without
involving any locks.
involving any locks. It does -not- trigger the at_access hook.
"""
if hasattr(self, "player"):
if self.player and self.player.is_superuser: