Updated all AutoUnload classes to be able to have their callbacks cal…

…led directly.

addons/source-python/packages/source-python/commands/command.py

@@ -33,7 +33,7 @@ def __call__(self, callback):
             self.names, self.callback, *self.args, **self.kwargs)
 
         # Return the original callback
-        return callback
+        return self.callback
 
     def _unload_instance(self):
         """Unregister the commands."""

addons/source-python/packages/source-python/commands/filter.py

@@ -31,6 +31,10 @@ def __init__(self, callback):
         # Register the filter
         self._manager_class.register_filter(self.callback)
 
+    def __call__(self, *args):
+        """Call the callback."""
+        self.callback(*args)
+
     def _unload_instance(self):
         """Unregister the filter."""
         self._manager_class.unregister_filter(self.callback)

addons/source-python/packages/source-python/entities/hooks.py

@@ -108,7 +108,9 @@ def __call__(self, callback):
         # class name. So, we need to wait until such an entity has been
         # created.
         _waiting_entity_hooks.append(self)
-        return self
+
+        # Return the callback
+        return self.callback
 
     @property
     def hook_type(self):

addons/source-python/packages/source-python/events/__init__.py

@@ -54,26 +54,26 @@ def __init__(self, *event_names):
                 raise ValueError('Event name must be a string.')
 
         self._event_names = event_names
-        self._callback = None
+        self.callback = None
 
     def __call__(self, callback):
         """Store the callback and register the events."""
         # Store the callback
-        self._callback = callback
+        self.callback = callback
 
         # Loop through all event names
         for event_name in self._event_names:
 
             # Register the event
-            event_manager.register_for_event(event_name, self._callback)
+            event_manager.register_for_event(event_name, self.callback)
 
-        # Return the instance so that it unloads properly
-        return self
+        # Return the callback
+        return self.callback
 
     def _unload_instance(self):
         """Unregister the events."""
         # Loop through all event names
         for event_name in self._event_names:
 
             # Unregister the event
-            event_manager.unregister_for_event(event_name, self._callback)
+            event_manager.unregister_for_event(event_name, self.callback)

addons/source-python/packages/source-python/events/hooks.py

@@ -50,29 +50,29 @@ class PreEvent(AutoUnload):
     def __init__(self, *event_names):
         """Store the event names."""
         self._event_names = event_names
-        self._callback = None
+        self.callback = None
 
     def __call__(self, callback):
         """Store the callback and register the pre-events."""
         # Store the callback
-        self._callback = callback
+        self.callback = callback
 
         # Loop through all pre-event names
         for event_name in self._event_names:
 
             # Register the pre-event
-            pre_event_manager.register_for_event(event_name, self._callback)
+            pre_event_manager.register_for_event(event_name, self.callback)
 
-        # Return the instance so that it unloads properly
-        return self
+        # Return the callback
+        return self.callback
 
     def _unload_instance(self):
         """Unregister the pre-events."""
         # Loop through all pre-event names
         for event_name in self._event_names:
 
             # Unregister the pre-event
-            pre_event_manager.unregister_for_event(event_name, self._callback)
+            pre_event_manager.unregister_for_event(event_name, self.callback)
 
 
 class _PreEventManager(dict):

addons/source-python/packages/source-python/hooks/base.py

@@ -83,6 +83,10 @@ def __init__(self, callback):
         self.callback = callback
         self._class_instance.append(self.callback)
 
+    def __call__(self, *args):
+        """Call the callback."""
+        self.callback(*args)
+
     def _unload_instance(self):
         """Unregister the hook."""
         self._class_instance.remove(self.callback)

addons/source-python/packages/source-python/memory/hooks.py

@@ -50,8 +50,8 @@ def __call__(self, callback):
         # Hook the callback to the Function
         self.function.add_hook(self.hook_type, self.callback)
 
-        # Return the object
-        return self
+        # Return the callback
+        return self.callback
 
     @property
     def hook_type(self):