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

Added a "replace" method to lockhandler, courtesy of patch by user Shell.

Browse source
This commit is contained in:
Griatch 2012-09-30 17:37:05 +02:00
parent a4adc035f2
commit 049cc84be7
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/locks/lockhandler.py
View file

@ -290,6 +290,16 @@ class LockHandler(object):
self.log_obj = None self.log_obj = None
return True return True
def replace(self, lockstring, log_obj=None):
"Replaces the lockstring entirely."
old_lockstring = str(self)
self.clear()
try:
return self.add(lockstring, log_obj)
except LockException:
self.add(old_lockstring, log_obj)
raise
def get(self, access_type): def get(self, access_type):
"get the lockstring of a particular type" "get the lockstring of a particular type"
return self.locks.get(access_type, None) return self.locks.get(access_type, None)
@ -386,7 +396,7 @@ class LockHandler(object):
or (hasattr(accessing_obj, 'get_player') and (not accessing_obj.get_player() or accessing_obj.get_player().is_superuser))): or (hasattr(accessing_obj, 'get_player') and (not accessing_obj.get_player() or accessing_obj.get_player().is_superuser))):
return True return True
locks = self. _parse_lockstring(lockstring) locks = self._parse_lockstring(lockstring)
for access_type in locks: for access_type in locks:
evalstring, func_tup, raw_string = locks[access_type] evalstring, func_tup, raw_string = locks[access_type]
true_false = tuple(tup[0](accessing_obj, self.obj, *tup[1], **tup[2]) for tup in func_tup) true_false = tuple(tup[0](accessing_obj, self.obj, *tup[1], **tup[2]) for tup in func_tup)