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

Run black reformatter on code

Browse source
This commit is contained in:
Griatch 2022-02-08 13:03:52 +01:00
parent 4582eb4085
commit bd3e31bf3c
178 changed files with 4511 additions and 3385 deletions
Download patch file Download diff file Expand all files Collapse all files

1
evennia/locks/lockfuncs.py
View file

@ -43,6 +43,7 @@ def true(*args, **kwargs):
"""
return True
def all(*args, **kwargs):
return True

26
evennia/locks/lockhandler.py
View file

@ -235,8 +235,11 @@ class LockHandler:
funcname, rest = (part.strip().strip(")") for part in funcstring.split("(", 1))
func = _LOCKFUNCS.get(funcname, None)
if not callable(func):
elist.append(_("Lock: lock-function '{lockfunc}' is not available.").format(
lockfunc=funcstring))
elist.append(
_("Lock: lock-function '{lockfunc}' is not available.").format(
lockfunc=funcstring
)
)
continue
args = list(arg.strip() for arg in rest.split(",") if arg and "=" not in arg)
kwargs = dict(
@ -263,13 +266,16 @@ class LockHandler:
continue
if access_type in locks:
duplicates += 1
wlist.append(_(
"LockHandler on {obj}: access type '{access_type}' "
"changed from '{source}' to '{goal}' ".format(
obj=self.obj,
access_type=access_type,
source=locks[access_type][2],
goal=raw_lockstring))
wlist.append(
_(
"LockHandler on {obj}: access type '{access_type}' "
"changed from '{source}' to '{goal}' ".format(
obj=self.obj,
access_type=access_type,
source=locks[access_type][2],
goal=raw_lockstring,
)
)
)
locks[access_type] = (evalstring, tuple(lock_funcs), raw_lockstring)
if wlist and WARNING_LOG:
@ -695,6 +701,7 @@ def check_lockstring(
access_type=access_type,
)
def check_perm(obj, permission, no_superuser_bypass=False):
"""
Shortcut for checking if an object has the given `permission`. If the
@ -713,6 +720,7 @@ def check_perm(obj, permission, no_superuser_bypass=False):
"""
from evennia.locks.lockfuncs import perm
if not no_superuser_bypass and obj.is_superuser:
return True
return perm(obj, None, permission)

10
evennia/locks/tests.py
View file

@ -215,12 +215,11 @@ class TestPermissionCheck(BaseEvenniaTest):
Test the PermissionHandler.check method
"""
def test_check__success(self):
"""Test combinations that should pass the check"""
self.assertEqual(
[perm for perm in self.char1.account.permissions.all()],
['developer', 'player']
[perm for perm in self.char1.account.permissions.all()], ["developer", "player"]
)
self.assertTrue(self.char1.permissions.check("Builder"))
self.assertTrue(self.char1.permissions.check("Builder", "Player"))
@ -234,12 +233,11 @@ class TestPermissionCheck(BaseEvenniaTest):
self.assertFalse(self.char1.permissions.check("Builder", "dummy", require_all=True))
self.assertFalse(self.char1.permissions.check("Developer", "foobar", require_all=True))
self.char1.account.permissions.remove('developer')
self.char1.account.permissions.remove("developer")
self.char1.account.permissions.add("Builder")
self.assertEqual(
[perm for perm in self.char1.account.permissions.all()],
['builder', 'player']
[perm for perm in self.char1.account.permissions.all()], ["builder", "player"]
)
self.assertFalse(self.char1.permissions.check("Developer"))
self.assertFalse(self.char1.permissions.check("Developer", "Player", require_all=True))