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 60634eba827fbe14f176f7da1aa912aaefb6463f..768653616407adbbcdf53d996bba594e593c56ee 100644 (file)
--- a/modlib.py
+++ b/modlib.py
@@ -39,9 +39,16 @@ class modlib(object):
                self.helps = []
                self.parent = None
 
-               self.name = (name.split(".", 1))[1]
+               self.name = (name.split("."))[-1]
 
        def modstart(self, parent):
+               #modstart can return a few things...
+               # None: unspecified success
+               # False: unspecified error
+               # modlib.error (or anything else False-y): specified error
+               # True: unspecified success
+               # non-empty string (or anything else True-y): specified success
+               #"specified" values will be printed. unspecified values will result in "OK" or "failed"
                self.parent = parent
                for cmd, func in self.hooks.iteritems():
                        self.parent.hook(cmd, func)
@@ -59,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:
@@ -102,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