diff --git a/Module.py b/Module.py index 496738a..853c977 100644 --- a/Module.py +++ b/Module.py @@ -68,12 +68,13 @@ class Module(object): Unhook handler functions from the IRC library. Inverse of the above. This is called by reload, to remove the soon-to-be old object from the server global handlers (or whatever has been added via register_handlers). Classes - inheriting from Module should implement this, e.g.: + inheriting from Module could implement this, e.g.: server.remove_global_handler('privmsg', self.on_privmsg) """ - print "looks like someone forgot to implement unregister_handlers!" + self.server.remove_global_handler('pubmsg', self.on_pubmsg) + self.server.remove_global_handler('privmsg', self.on_privmsg) def on_pubmsg(self, connection, event): """ diff --git a/modules/Countdown.py b/modules/Countdown.py index f844173..f976732 100644 --- a/modules/Countdown.py +++ b/modules/Countdown.py @@ -28,10 +28,6 @@ from Module import Module class Countdown(Module): - def unregister_handlers(self): - self.server.remove_global_handler('pubmsg', self.on_pubmsg) - self.server.remove_global_handler('privmsg', self.on_privmsg) - def do(self, connection, event, nick, userhost, replypath, what, admin_unlocked): whats = what.split(' ') if whats[0] == 'countdown' and len(whats) >= 2: diff --git a/modules/Dice.py b/modules/Dice.py index 0df10e6..31e52fc 100644 --- a/modules/Dice.py +++ b/modules/Dice.py @@ -25,10 +25,6 @@ from Module import Module class Dice(Module): - def unregister_handlers(self): - self.server.remove_global_handler('pubmsg', self.on_pubmsg) - self.server.remove_global_handler('privmsg', self.on_privmsg) - def do(self, connection, event, nick, userhost, replypath, what, admin_unlocked): overallroll = what diff --git a/modules/FactFile.py b/modules/FactFile.py index 2ae34a4..312519f 100644 --- a/modules/FactFile.py +++ b/modules/FactFile.py @@ -27,10 +27,6 @@ from Module import Module class FactFile(Module): - def unregister_handlers(self): - self.server.remove_global_handler('pubmsg', self.on_pubmsg) - self.server.remove_global_handler('privmsg', self.on_privmsg) - def do(self, connection, event, nick, userhost, replypath, what, admin_unlocked): whats = what.split(' ') try: diff --git a/modules/GoogleTranslate.py b/modules/GoogleTranslate.py index bd6d542..c0a389c 100644 --- a/modules/GoogleTranslate.py +++ b/modules/GoogleTranslate.py @@ -27,10 +27,6 @@ from Module import Module class GoogleTranslate(Module): - def unregister_handlers(self): - self.server.remove_global_handler('pubmsg', self.on_pubmsg) - self.server.remove_global_handler('privmsg', self.on_privmsg) - def do(self, connection, event, nick, userhost, replypath, what, admin_unlocked): whats = what.split(' ') if whats[0] == 'translate' and len(whats) >= 4: diff --git a/modules/Seen.py b/modules/Seen.py index 16ff67b..13a4c3b 100644 --- a/modules/Seen.py +++ b/modules/Seen.py @@ -28,10 +28,6 @@ from Module import Module class Seen(Module): - def unregister_handlers(self): - self.server.remove_global_handler('pubmsg', self.on_pubmsg) - self.server.remove_global_handler('privmsg', self.on_privmsg) - # Overriding the default because we need stuff to occur before the addressed # and so on checks.