Made the owner parameter for __get__ optional in both BoundCommandFunc and UnboundCommand func

Also:
- Restored the simple attribute definition for `__name__` attribute in BoundCommandFunc and UnboundCommandFund

Author: tleonhardt

cmd2/annotated.py

@@ -311,6 +311,7 @@ def do_build(self, target: str, common: CommonArgs):
 from .rich_utils import Cmd2HelpFormatter, HelpContent
 from .types import (
     BoundCommandFunc,
+    CmdOrSet,
     CmdOrSetT,
     UnboundChoicesProvider,
     UnboundCommandFunc,
@@ -321,7 +322,7 @@ def do_build(self, target: str, common: CommonArgs):
 _NargsValue = int | str | tuple[int] | tuple[int, int] | tuple[int, float]
 
 
-_CommandFunc: TypeAlias = BoundCommandFunc | UnboundCommandFunc[CmdOrSetT, Any]
+_CommandFunc: TypeAlias = BoundCommandFunc | UnboundCommandFunc[CmdOrSet, Any]
 
 
 class Cmd2ParserKwargs(TypedDict, total=False):

cmd2/types.py

@@ -72,13 +72,9 @@
 class BoundCommandFunc(Protocol):
     """Protocol for a command function bound to a command instance."""
 
+    __name__: str
     __qualname__: str
 
-    @property
-    def __name__(self) -> str:
-        """The name of the bound command function."""
-        ...
-
     def __call__(self, *args: Any, **kwargs: Any) -> bool | None:
         """Invoke the bound command function."""
 
@@ -88,22 +84,18 @@ def __call__(self, *args: Any, **kwargs: Any) -> bool | None:
 class UnboundCommandFunc(Protocol[CmdOrSetT, P]):
     """Protocol for an unbound command function."""
 
+    __name__: str
     __qualname__: str
 
-    @property
-    def __name__(self) -> str:
-        """The name of the unbound command function."""
-        ...
-
     def __call__(self, __self: CmdOrSetT, /, *args: P.args, **kwargs: P.kwargs) -> bool | None:
         """Invoke the unbound command function with its command instance."""
         ...
 
     @overload
-    def __get__(self, instance: None, owner: Any) -> "UnboundCommandFunc[CmdOrSetT, P]": ...
+    def __get__(self, instance: None, owner: Any = ...) -> "UnboundCommandFunc[CmdOrSetT, P]": ...
 
     @overload
-    def __get__(self, instance: CmdOrSetT, owner: Any) -> BoundCommandFunc: ...
+    def __get__(self, instance: CmdOrSetT, owner: Any = ...) -> BoundCommandFunc: ...
 
 
 ##################################################################################################