fixing bug where TriviaState used global variable instead of self

[erebus.git] / modlib.py

diff --git a/modlib.py b/modlib.py
index 7e9a742506545fa27ae1b88d0a53cbc0e7d779bb..02b657e6859b11266e8a06130de708ce60d2cd18 100644 (file)
--- a/modlib.py
+++ b/modlib.py
@@ -10,7 +10,7 @@ class error(object):
        def __repr__(self):
                return '<modlib.error %r>' % self.errormsg
        def __str__(self):
-               return self.errormsg
+               return str(self.errormsg)
 
 class modlib(object):
        # default (global) access levels
@@ -34,6 +34,7 @@ class modlib(object):
        def __init__(self, name):
                self.hooks = {}
                self.numhooks = {}
+               self.chanhooks = {}
                self.parent = None
 
                self.name = name
@@ -44,12 +45,16 @@ class modlib(object):
                        self.parent.hook(cmd, func)
                for num, func in self.numhooks.iteritems():
                        self.parent.hooknum(num, func)
+               for chan, func in self.chanhooks.iteritems():
+                       self.parent.hookchan(chan, func)
                return True
        def modstop(self, parent):
                for cmd, func in self.hooks.iteritems():
                        self.parent.unhook(cmd, func)
                for num, func in self.numhooks.iteritems():
                        self.parent.unhooknum(num, func)
+               for chan, func in self.chanhooks.iteritems():
+                       self.parent.unhookchan(chan, func)
                return True
 
        def hooknum(self, num):
@@ -60,6 +65,14 @@ class modlib(object):
                        return func
                return realhook
 
+       def hookchan(self, chan, glevel=ANYONE, clevel=PUBLIC):
+               def realhook(func):
+                       self.chanhooks[chan] = func
+                       if self.parent is not None:
+                               self.parent.hookchan(chan, func)
+                       return func
+               return realhook
+
        def hook(self, cmd, needchan=True, glevel=ANYONE, clevel=PUBLIC):
                def realhook(func):
                        func.needchan = needchan