Made some type hints more strict.

Author: kmvanbrunt

cmd2/argparse_completer.py

@@ -35,6 +35,7 @@
 from .exceptions import CompletionError
 from .rich_utils import Cmd2SimpleTable
 from .types import (
+    CmdOrSetT,
     UnboundChoicesProvider,
     UnboundCompleter,
 )
@@ -733,7 +734,7 @@ def _choices_to_items(self, arg_state: _ArgumentState) -> list[CompletionItem]:
 
     def _prepare_callable_params(
         self,
-        to_call: UnboundChoicesProvider[Any] | UnboundCompleter[Any],
+        to_call: UnboundChoicesProvider[CmdOrSetT] | UnboundCompleter[CmdOrSetT],
         arg_state: _ArgumentState,
         text: str,
         consumed_arg_values: dict[str, list[str]],

cmd2/argparse_custom.py

@@ -262,6 +262,7 @@ def get_choices(self) -> Choices:
 from .rich_utils import Cmd2RichArgparseConsole
 from .styles import Cmd2Style
 from .types import (
+    CmdOrSetT,
     UnboundChoicesProvider,
     UnboundCompleter,
 )
@@ -387,8 +388,8 @@ def _ActionsContainer_add_argument(  # noqa: N802
     self: argparse._ActionsContainer,
     *args: Any,
     nargs: int | str | tuple[int] | tuple[int, int] | tuple[int, float] | None = None,
-    choices_provider: UnboundChoicesProvider[Any] | None = None,
-    completer: UnboundCompleter[Any] | None = None,
+    choices_provider: UnboundChoicesProvider[CmdOrSetT] | None = None,
+    completer: UnboundCompleter[CmdOrSetT] | None = None,
     suppress_tab_hint: bool = False,
     table_columns: Sequence[str | Column] | None = None,
     **kwargs: Any,

cmd2/cmd2.py

@@ -163,6 +163,7 @@
     BoundCommandFunc,
     BoundCompleter,
     CmdOrSet,
+    CmdOrSetT,
     UnboundChoicesProvider,
     UnboundCompleter,
 )
@@ -3478,8 +3479,8 @@ def _resolve_completer(
         self,
         preserve_quotes: bool = False,
         choices: Iterable[Any] | None = None,
-        choices_provider: UnboundChoicesProvider[Any] | None = None,
-        completer: UnboundCompleter[Any] | None = None,
+        choices_provider: UnboundChoicesProvider[CmdOrSetT] | None = None,
+        completer: UnboundCompleter[CmdOrSetT] | None = None,
         parser: Cmd2ArgumentParser | None = None,
     ) -> Completer:
         """Determine the appropriate completer based on provided arguments."""
@@ -3510,8 +3511,8 @@ def read_input(
         history: Sequence[str] | None = None,
         preserve_quotes: bool = False,
         choices: Iterable[Any] | None = None,
-        choices_provider: UnboundChoicesProvider[Any] | None = None,
-        completer: UnboundCompleter[Any] | None = None,
+        choices_provider: UnboundChoicesProvider[CmdOrSetT] | None = None,
+        completer: UnboundCompleter[CmdOrSetT] | None = None,
         parser: Cmd2ArgumentParser | None = None,
     ) -> str:
         """Read a line of input with optional completion and history.

cmd2/utils.py

@@ -29,6 +29,7 @@
 from . import string_utils as su
 from .types import (
     CmdOrSet,
+    CmdOrSetT,
     UnboundChoicesProvider,
     UnboundCompleter,
 )
@@ -76,8 +77,8 @@ def __init__(
         settable_attrib_name: str | None = None,
         onchange_cb: Callable[[str, Any, Any], Any] | None = None,
         choices: Iterable[Any] | None = None,
-        choices_provider: UnboundChoicesProvider[Any] | None = None,
-        completer: UnboundCompleter[Any] | None = None,
+        choices_provider: UnboundChoicesProvider[CmdOrSetT] | None = None,
+        completer: UnboundCompleter[CmdOrSetT] | None = None,
     ) -> None:
         """Settable Initializer.