Fixed check for whether a subcommand was entered

Author: kmvanbrunt

examples/subcommands.py

@@ -63,9 +63,10 @@ def complete_base_sport(self, text, line, begidx, endidx):
     @with_argparser(base_parser)
     def do_base(self, args):
         """Base command help"""
-        if args.func is not None:
+        func = getattr(args, 'func', None)
+        if func is not None:
             # Call whatever subcommand function was selected
-            args.func(self, args)
+            func(self, args)
         else:
             # No subcommand was provided, so call help
             self.do_help('base')

tests/test_completion.py

@@ -723,10 +723,11 @@ def base_bar(self, args):
     @cmd2.with_argparser(base_parser)
     def do_base(self, args):
         """Base command help"""
-        try:
-            # Call whatever sub-command function was selected
-            args.func(self, args)
-        except AttributeError:
+        func = getattr(args, 'func', None)
+        if func is not None:
+            # Call whatever subcommand function was selected
+            func(self, args)
+        else:
             # No sub-command was provided, so as called
             self.do_help('base')