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

Fix hard-coded lock names in event system to match new hierarchy.

Browse source
This commit is contained in:
Griatch 2017-07-09 13:03:01 +02:00
parent 594500c4c7
commit be8452b1c7
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
evennia/comms/managers.py
View file

@ -377,7 +377,7 @@ class ChannelDBManager(TypedObjectManager):
""" """
clsname = subscriber.__dbclass__.__name__ clsname = subscriber.__dbclass__.__name__
if clsname == "AccountDB": if clsname == "AccountDB":
return subscriber.subscription_set.all() return subscriber.account_subscription_set.all()
if clsname == "ObjectDB": if clsname == "ObjectDB":
return subscriber.object_subscription_set.all() return subscriber.object_subscription_set.all()
return [] return []

8
evennia/contrib/events/commands.py
View file

@ -17,8 +17,8 @@ COMMAND_DEFAULT_CLASS = class_from_module(settings.COMMAND_DEFAULT_CLASS)
# Permissions # Permissions
WITH_VALIDATION = getattr(settings, "callbackS_WITH_VALIDATION", None) WITH_VALIDATION = getattr(settings, "callbackS_WITH_VALIDATION", None)
WITHOUT_VALIDATION = getattr(settings, "callbackS_WITHOUT_VALIDATION", WITHOUT_VALIDATION = getattr(settings, "callbackS_WITHOUT_VALIDATION",
"immortals") "developer")
VALIDATING = getattr(settings, "callbackS_VALIDATING", "immortals") VALIDATING = getattr(settings, "callbackS_VALIDATING", "developer")
# Split help text # Split help text
BASIC_HELP = "Add, edit or delete callbacks." BASIC_HELP = "Add, edit or delete callbacks."
@ -363,8 +363,8 @@ class CmdCallback(COMMAND_DEFAULT_CLASS):
callback["number"] = number callback["number"] = number
self.caller.db._callback = callback self.caller.db._callback = callback
EvEditor(self.caller, loadfunc=_ev_load, savefunc=_ev_save, EvEditor(self.caller, loadfunc=_ev_load, savefunc=_ev_save,
quitfunc=_ev_quit, key="Callback {} of {}".format( quitfunc=_ev_quit, key="Callback {} of {}".format(
callback_name, obj), persistent=True, codefunc=_ev_save) callback_name, obj), persistent=True, codefunc=_ev_save)
def del_callback(self): def del_callback(self):
"""Delete a callback.""" """Delete a callback."""

2
evennia/utils/evform_test.py
View file

@ -9,7 +9,7 @@ TABLECHAR = "c"
FORM = """ FORM = """
.------------------------------------------------. .------------------------------------------------.
| | | |
| Name: xxxxxAAxxxx Player: xxxxxxx2xxxxxxx | | Name: xxxxxAAxxxx Account: xxxxxxx2xxxxxxx |
| xxxxxxxxxxx | | xxxxxxxxxxx |
| | | |
>----------------------------------------------< >----------------------------------------------<

2
evennia/utils/tests.py
View file

@ -387,7 +387,7 @@ class TestEvForm(TestCase):
u'| Name: \x1b[0m\x1b[1m\x1b[32mTom\x1b[1m\x1b[32m \x1b' u'| Name: \x1b[0m\x1b[1m\x1b[32mTom\x1b[1m\x1b[32m \x1b'
u'[1m\x1b[32mthe\x1b[1m\x1b[32m \x1b[0m \x1b[0m ' u'[1m\x1b[32mthe\x1b[1m\x1b[32m \x1b[0m \x1b[0m '
u'Account: \x1b[0m\x1b[1m\x1b[33mGriatch ' u'Account: \x1b[0m\x1b[1m\x1b[33mGriatch '
u'\x1b[0m\x1b[0m\x1b[1m\x1b[32m\x1b[1m\x1b[32m\x1b[1m\x1b[32m\x1b[1m\x1b[32m\x1b[0m\x1b[0m ' u'\x1b[0m\x1b[0m\x1b[1m\x1b[32m\x1b[1m\x1b[32m\x1b[1m\x1b[32m\x1b[1m\x1b[32m\x1b[0m\x1b[0m '
u'|\n' u'|\n'
u'| \x1b[0m\x1b[1m\x1b[32mBouncer\x1b[0m \x1b[0m |\n' u'| \x1b[0m\x1b[1m\x1b[32mBouncer\x1b[0m \x1b[0m |\n'
u'| |\n' u'| |\n'