]> git.llucax.com Git - software/pymin.git/commitdiff
Bugfix: skip SubHandlers parent when looking for a handler/command/help.
authorLeandro Lucarella <llucarella@integratech.com.ar>
Wed, 10 Oct 2007 20:19:18 +0000 (17:19 -0300)
committerLeandro Lucarella <llucarella@integratech.com.ar>
Wed, 10 Oct 2007 20:31:19 +0000 (17:31 -0300)
pymin/dispatcher.py

index 7e918bd113bf6c1b37ad3c911d949dfc1307be21..17075a3f1dfec8617432dd68fb532022f7299b2b 100644 (file)
@@ -202,10 +202,13 @@ class Handler:
             d = dict()
             for a in dir(self):
                 h = getattr(self, a)
+                if a == 'parent': continue # Skip parents in SubHandlers
                 if is_handler(h) or isinstance(h, Handler):
                     d[a] = h.handler_help
             return d
         # A command was specified
+        if command == 'parent': # Skip parents in SubHandlers
+            raise HelpNotFoundError(command)
         if not hasattr(self, command.encode('utf-8')):
             raise HelpNotFoundError(command)
         handler = getattr(self, command.encode('utf-8'))
@@ -442,6 +445,8 @@ class Dispatcher:
                     raise CommandIsAHandlerError(command)
                 raise CommandNotFoundError(command)
             command.append(route[0])
+            if route[0] == 'parent':
+                raise CommandNotFoundError(command)
             if not hasattr(handler, route[0].encode('utf-8')):
                 if isinstance(handler, Handler) and len(command) > 1:
                     raise CommandNotInHandlerError(command)