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

Refactor code to remove alerts as per lgtm and #1176.

Browse source
This commit is contained in:
Griatch 2017-01-29 19:02:00 +01:00
parent dcde526f6d
commit 74eebfed6d
54 changed files with 226 additions and 264 deletions
Download patch file Download diff file Expand all files Collapse all files

3
evennia/locks/lockfuncs.py
View file

@ -383,6 +383,7 @@ def locattr(accessing_obj, accessed_obj, *args, **kwargs):
accessing_obj = accessing_obj.obj
if hasattr(accessing_obj, "location"):
return attr(accessing_obj.location, accessed_obj, *args, **kwargs)
return False
def objlocattr(accessing_obj, accessed_obj, *args, **kwargs):
"""
@ -402,6 +403,7 @@ def objlocattr(accessing_obj, accessed_obj, *args, **kwargs):
accessed_obj = accessed_obj.obj
if hasattr(accessed_obj, "location"):
return attr(accessed_obj.location, accessed_obj, *args, **kwargs)
return False
def attr_eq(accessing_obj, accessed_obj, *args, **kwargs):
@ -550,6 +552,7 @@ def holds(accessing_obj, accessed_obj, *args, **kwargs):
for obj in contents:
if obj.attributes.get(args[0]) == args[1]:
return True
return False
def superuser(*args, **kwargs):

7
evennia/locks/lockhandler.py
View file

@ -525,9 +525,10 @@ class LockHandler(object):
else:
return self._eval_access_type(
accessing_obj, locks, access_type)
for access_type in locks:
return self._eval_access_type(accessing_obj, locks, access_type)
else:
# if no access types was given and multiple locks were
# embedded in the lockstring we assume all must be true
return all(self._eval_access_type(accessing_obj, locks, access_type) for access_type in locks)
def _test():