Fix mypy errors

Author: virtuald

commands2/button/commandjoystick.py

@@ -13,6 +13,8 @@ class CommandJoystick(CommandGenericHID):
     A version of Joystick with Trigger factories for command-based.
     """
 
+    _hid: Joystick
+
     def __init__(self, port: int):
         """
         Construct an instance of a controller.

commands2/button/commandps4controller.py

@@ -13,6 +13,8 @@ class CommandPS4Controller(CommandGenericHID):
     A version of PS4Controller with Trigger factories for command-based.
     """
 
+    _hid: PS4Controller
+
     def __init__(self, port: int):
         """
         Construct an instance of a device.

commands2/button/commandxboxcontroller.py

@@ -13,6 +13,8 @@ class CommandXboxController(CommandGenericHID):
     A version of XboxController with Trigger factories for command-based.
     """
 
+    _hid: XboxController
+
     def __init__(self, port: int):
         """
         Construct an instance of a controller.

commands2/command.py

@@ -6,7 +6,7 @@
 from enum import Enum
 from typing import TYPE_CHECKING, Any, Callable, Set
 
-from typing_extensions import Self
+from typing_extensions import Self, TypeAlias
 
 if TYPE_CHECKING:
     from .instantcommand import InstantCommand
@@ -54,7 +54,9 @@ class Command(Sendable):
     This class is provided by the NewCommands VendorDep
     """
 
-    InterruptionBehavior = InterruptionBehavior  # type alias for 2023 location
+    InterruptionBehavior: TypeAlias = (
+        InterruptionBehavior  # type alias for 2023 location
+    )
 
     requirements: Set[Subsystem]
 

commands2/commandscheduler.py

@@ -21,9 +21,9 @@ class CommandScheduler:
     methods to be called and for their default commands to be scheduled.
     """
 
-    _instance: Optional[Self] = None
+    _instance: Optional[CommandScheduler] = None
 
-    def __new__(cls) -> Self:
+    def __new__(cls) -> CommandScheduler:
         if cls._instance is None:
             return super().__new__(cls)
         return cls._instance

commands2/util.py

@@ -1,14 +1,14 @@
 from __future__ import annotations
 
-from typing import Iterable, Tuple, Union
+from typing import Iterable, List, Tuple, Union
 
 from .command import Command
 
 
 def flatten_args_commands(
     *commands: Union[Command, Iterable[Command]]
-) -> Tuple[Command]:
-    flattened_commands = []
+) -> Tuple[Command, ...]:
+    flattened_commands: List[Command] = []
     for command in commands:
         if isinstance(command, Command):
             flattened_commands.append(command)

commands2/wrappercommand.py

@@ -26,6 +26,7 @@ def __init__(self, command: Command):
 
         CommandScheduler.getInstance().registerComposedCommands([command])
         self._command = command
+        self.setName(self._command.getName())
 
     def initialize(self):
         """The initial subroutine of a command. Called once when the command is initially scheduled."""