From be8452b1c792686b81c0062fd91c38f23f963475 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sun, 9 Jul 2017 13:03:01 +0200
Subject: [PATCH] Fix hard-coded lock names in event system to match new
 hierarchy.

---
 evennia/comms/managers.py          | 2 +-
 evennia/contrib/events/commands.py | 8 ++++----
 evennia/utils/evform_test.py       | 2 +-
 evennia/utils/tests.py             | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/evennia/comms/managers.py b/evennia/comms/managers.py
index ce500f3ba..b412127ff 100644
--- a/evennia/comms/managers.py
+++ b/evennia/comms/managers.py
@@ -377,7 +377,7 @@ class ChannelDBManager(TypedObjectManager):
         """
         clsname = subscriber.__dbclass__.__name__
         if clsname == "AccountDB":
-            return subscriber.subscription_set.all()
+            return subscriber.account_subscription_set.all()
         if clsname == "ObjectDB":
             return subscriber.object_subscription_set.all()
         return []
diff --git a/evennia/contrib/events/commands.py b/evennia/contrib/events/commands.py
index bbbd07a14..fce7b306c 100644
--- a/evennia/contrib/events/commands.py
+++ b/evennia/contrib/events/commands.py
@@ -17,8 +17,8 @@ COMMAND_DEFAULT_CLASS = class_from_module(settings.COMMAND_DEFAULT_CLASS)
 # Permissions
 WITH_VALIDATION = getattr(settings, "callbackS_WITH_VALIDATION", None)
 WITHOUT_VALIDATION = getattr(settings, "callbackS_WITHOUT_VALIDATION",
-        "immortals")
-VALIDATING = getattr(settings, "callbackS_VALIDATING", "immortals")
+        "developer")
+VALIDATING = getattr(settings, "callbackS_VALIDATING", "developer")
 
 # Split help text
 BASIC_HELP = "Add, edit or delete callbacks."
@@ -363,8 +363,8 @@ class CmdCallback(COMMAND_DEFAULT_CLASS):
         callback["number"] = number
         self.caller.db._callback = callback
         EvEditor(self.caller, loadfunc=_ev_load, savefunc=_ev_save,
-                quitfunc=_ev_quit, key="Callback {} of {}".format(
-                callback_name, obj), persistent=True, codefunc=_ev_save)
+                 quitfunc=_ev_quit, key="Callback {} of {}".format(
+                 callback_name, obj), persistent=True, codefunc=_ev_save)
 
     def del_callback(self):
         """Delete a callback."""
diff --git a/evennia/utils/evform_test.py b/evennia/utils/evform_test.py
index 8d7dd8a2c..dfe43bf35 100644
--- a/evennia/utils/evform_test.py
+++ b/evennia/utils/evform_test.py
@@ -9,7 +9,7 @@ TABLECHAR = "c"
 FORM = """
 .------------------------------------------------.
 |                                                |
-|  Name: xxxxxAAxxxx    Player: xxxxxxx2xxxxxxx  |
+|  Name: xxxxxAAxxxx    Account: xxxxxxx2xxxxxxx |
 |        xxxxxxxxxxx                             |
 |                                                |
  >----------------------------------------------<
diff --git a/evennia/utils/tests.py b/evennia/utils/tests.py
index 32116286a..a168951a2 100644
--- a/evennia/utils/tests.py
+++ b/evennia/utils/tests.py
@@ -387,7 +387,7 @@ class TestEvForm(TestCase):
                          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'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'|        \x1b[0m\x1b[1m\x1b[32mBouncer\x1b[0m    \x1b[0m                             |\n'
                          u'|                                                |\n'