New exception: IRCException

When raised in a module, respond in the channel with the given string as Response content

exception.py

@@ -0,0 +1,29 @@
+# coding=utf-8
+
+# Nemubot is a modulable IRC bot, built around XML configuration files.
+# Copyright (C) 2012  Mercier Pierre-Olivier
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from response import Response
+
+class IRCException(Exception):
+
+    def __init__(self, message, personnal=True):
+        super(IRCException, self).__init__(message)
+        self.message = message
+        self.personnal = personnal
+
+    def fill_response(self, msg):
+        return Response(msg.sender, self.message, channel=msg.channel, nick=(msg.nick if self.personnal else None))

hooks.py

@@ -19,6 +19,7 @@
 import re
 
 from response import Response
+from exception import IRCException
 
 class MessagesHook:
     def __init__(self, context, bot):
@@ -199,22 +200,25 @@ class Hook:
         else:
             call = self.call
 
-        if self.data is None:
+        try:
-            if data2 is None:
+            if self.data is None:
-                return call(msg)
+                if data2 is None:
-            elif isinstance(data2, dict):
+                    return call(msg)
-                return call(msg, **data2)
+                elif isinstance(data2, dict):
+                    return call(msg, **data2)
+                else:
+                    return call(msg, data2)
+            elif isinstance(self.data, dict):
+                if data2 is None:
+                    return call(msg, **self.data)
+                else:
+                    return call(msg, data2, **self.data)
             else:
-                return call(msg, data2)
+                if data2 is None:
-        elif isinstance(self.data, dict):
+                    return call(msg, self.data)
-            if data2 is None:
+                elif isinstance(data2, dict):
-                return call(msg, **self.data)
+                    return call(msg, self.data, **data2)
-            else:
+                else:
-                return call(msg, data2, **self.data)
+                    return call(msg, self.data, data2)
-        else:
+        except IRCException as e:
-            if data2 is None:
+            return e.fill_response(msg)
-                return call(msg, self.data)
-            elif isinstance(data2, dict):
-                return call(msg, self.data, **data2)
-            else:
-                return call(msg, self.data, data2)

importer.py

@@ -23,6 +23,7 @@ import os
 import sys
 
 import event
+import exception
 from hooks import Hook
 import response
 import xmlparser
@@ -172,6 +173,7 @@ class ModuleLoader(SourceLoader):
         module.ModuleEvent = event.ModuleEvent
         module.ModuleState = xmlparser.module_state.ModuleState
         module.Response = response.Response
+        module.IRCException = exception.IRCException
 
         # Load dependancies
         if module.CONF is not None and module.CONF.hasNode("dependson"):