Merge branch 'main' into prompt-toolkit

Author: tleonhardt

examples/modular_commands.py

@@ -7,10 +7,10 @@
 import argparse
 from collections.abc import Iterable
 
-from modular_commands.commandset_basic import (  # noqa: F401
+from modular_commands.commandset_basic import (
     BasicCompletionCommandSet,
 )
-from modular_commands.commandset_complex import (  # noqa: F401
+from modular_commands.commandset_complex import (
     CommandSetA,
 )
 from modular_commands.commandset_custominit import (
@@ -64,6 +64,6 @@ def do_example(self, _: argparse.Namespace) -> None:
     import sys
 
     print("Starting")
-    my_sets = [CustomInitCommandSet('First argument', 'Second argument')]
+    my_sets = [BasicCompletionCommandSet(), CommandSetA(), CustomInitCommandSet('First argument', 'Second argument')]
     app = WithCommandSets(command_sets=my_sets)
     sys.exit(app.cmdloop())

examples/modular_commands/commandset_custominit.py

@@ -1,7 +1,6 @@
 """A simple example demonstrating a loadable command set."""
 
 from cmd2 import (
-    Cmd,
     CommandSet,
     Statement,
     with_default_category,
@@ -16,8 +15,8 @@ def __init__(self, arg1, arg2) -> None:
         self._arg1 = arg1
         self._arg2 = arg2
 
-    def do_show_arg1(self, _cmd: Cmd, _: Statement) -> None:
+    def do_show_arg1(self, _: Statement) -> None:
         self._cmd.poutput('Arg1: ' + self._arg1)
 
-    def do_show_arg2(self, _cmd: Cmd, _: Statement) -> None:
+    def do_show_arg2(self, _: Statement) -> None:
         self._cmd.poutput('Arg2: ' + self._arg2)