modlib - use parent provided to modstop directly, instead of relying on self.parent...

[erebus.git] / modlib.py

diff --git a/modlib.py b/modlib.py
index 05ecf53ebe3d50fb0fbfaec8777ab0d92a551431..768653616407adbbcdf53d996bba594e593c56ee 100644 (file)
--- a/modlib.py
+++ b/modlib.py
@@ -66,12 +66,12 @@ class modlib(object):
                return True
        def modstop(self, parent):
                for cmd, func in self.hooks.iteritems():
-                       self.parent.unhook(cmd, func)
-                       self.parent.unhook("%s.%s" % (self.name, cmd), func)
+                       parent.unhook(cmd, func)
+                       parent.unhook("%s.%s" % (self.name, cmd), func)
                for num, func in self.numhooks.iteritems():
-                       self.parent.unhooknum(num, func)
+                       parent.unhooknum(num, func)
                for chan, func in self.chanhooks.iteritems():
-                       self.parent.unhookchan(chan, func)
+                       parent.unhookchan(chan, func)
 
                for func, args, kwargs in self.helps:
                        try:
@@ -109,6 +109,7 @@ class modlib(object):
                        func.reqglevel = glevel
                        func.reqclevel = clevel
                        func.cmd = cmd
+                       func.module = func.__module__.split('.')[1]
 
                        for c in cmd:
                                self.hooks[c] = func