Move the interrupting exception of events

evennia/contrib/events/eventfuncs.py

@@ -6,7 +6,7 @@ Eventfuncs are just Python functions that can be used inside of calllbacks.
 """
 
 from evennia import ObjectDB, ScriptDB
-from evennia.contrib.events.exceptions import InterruptEvent
+from evennia.contrib.events.utils import InterruptEvent
 
 def deny():
     """

evennia/contrib/events/exceptions.py

@@ -1,15 +0,0 @@
-"""
-Module containing the exceptions of the event system.
-"""
-
-class InterruptEvent(RuntimeError):
-
-    """
-    Interrupt the current event.
-
-    You shouldn't have to use this exception directly, probably use the
-    `deny()` function that handles it instead.
-
-    """
-
-    pass

evennia/contrib/events/scripts.py

@@ -14,9 +14,8 @@ from evennia import logger
 from evennia.utils.create import create_channel
 from evennia.utils.dbserialize import dbserialize
 from evennia.utils.utils import all_from_module, delay
-from evennia.contrib.events.exceptions import InterruptEvent
 from evennia.contrib.events.handler import CallbackHandler
-from evennia.contrib.events.utils import get_next_wait, EVENTS
+from evennia.contrib.events.utils import get_next_wait, EVENTS, InterruptEvent
 
 # Constants
 RE_LINE_ERROR = re.compile(r'^  File "\<string\>", line (\d+)')

evennia/contrib/events/utils.py

@@ -233,3 +233,15 @@ def phrase_event(callbacks, parameters):
             to_call.append(callback)
 
     return to_call
+
+class InterruptEvent(RuntimeError):
+
+    """
+    Interrupt the current event.
+
+    You shouldn't have to use this exception directly, probably use the
+    `deny()` function that handles it instead.
+
+    """
+
+    pass