Trap SystemExit when calling argparse.parse() to on argparse commands.

1 files changed, 12 insertions, 4 deletions

diff --git a/cmd2/cmd2.py b/cmd2/cmd2.py
index 4437426e..98334819 100755
--- a/cmd2/cmd2.py
+++ b/cmd2/cmd2.py
@@ -251,8 +251,12 @@ def with_argparser_and_unknown_args(argparser: argparse.ArgumentParser) -> Calla
         @functools.wraps(func)
         def cmd_wrapper(instance, cmdline):
             lexed_arglist = parse_quoted_string(cmdline)
-            args, unknown = argparser.parse_known_args(lexed_arglist)
-            return func(instance, args, unknown)
+            try:
+                args, unknown = argparser.parse_known_args(lexed_arglist)
+            except SystemExit:
+                return
+            else:
+                return func(instance, args, unknown)
 
         # argparser defaults the program name to sys.argv[0]
         # we want it to be the name of our command
@@ -288,8 +292,12 @@ def with_argparser(argparser: argparse.ArgumentParser) -> Callable:
         @functools.wraps(func)
         def cmd_wrapper(instance, cmdline):
             lexed_arglist = parse_quoted_string(cmdline)
-            args = argparser.parse_args(lexed_arglist)
-            return func(instance, args)
+            try:
+                args = argparser.parse_args(lexed_arglist)
+            except SystemExit:
+                return
+            else:
+                return func(instance, args)
 
         # argparser defaults the program name to sys.argv[0]
         # we want it to be the name of our command