Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-16 21:06:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Correct lockhandler's handling of lock-lists

Browse source
This commit is contained in:
Griatch 2017-08-31 20:58:34 +02:00
parent 328616d24e
commit b737c209b1
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
evennia/locks/lockhandler.py
View file

@ -292,18 +292,25 @@ class LockHandler(object):
Add a new lockstring to handler.
Args:
lockstring (str): A string on the form
lockstring (str or list): A string on the form
`"<access_type>:<functions>"`. Multiple access types
should be separated by semicolon (`;`).
should be separated by semicolon (`;`). Alternatively,
a list with lockstrings.
Returns:
success (bool): The outcome of the addition, `False` on
error.
"""
if isinstance(lockstring, basestring):
lockdefs = lockstring.split(";")
else:
lockdefs = [lockdef for locks in lockstring for lockdef in locks.split(";")]
lockstring = ";".join(lockdefs)
# sanity checks
for lockdef in lockstring.split(';'):
if ':' not in lockstring:
for lockdef in lockdefs:
if ':' not in lockdef:
self._log_error(_("Lock: '%s' contains no colon (:).") % lockdef)
return False
access_type, rhs = [part.strip() for part in lockdef.split(':', 1)]