Merge branch 'master' into new_quoted_completion

2 files changed, 7 insertions, 5 deletions

diff --git a/examples/subcommands.py b/examples/subcommands.py
index 2a7e0afa..bc82b548 100755
--- a/examples/subcommands.py
+++ b/examples/subcommands.py
@@ -63,9 +63,10 @@ class SubcommandsExample(cmd2.Cmd):
     @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')
diff --git a/tests/test_completion.py b/tests/test_completion.py
index aa32d444..8b9eba63 100644
--- a/tests/test_completion.py
+++ b/tests/test_completion.py
@@ -650,9 +650,10 @@ class SubcommandsExample(cmd2.Cmd):
     @cmd2.with_argparser(base_parser)
     def do_base(self, args):
         """Base command help"""
-        if args.func is not None:
-            # Call whatever sub-command function was selected
-            args.func(self, args)
+        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')