Run pyupgrade

ruff check --select=UP,F401 --unsafe-fixes docs magicbot robotpy_ext --fix

Author: auscompgeek

docs/conf.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import sys
 import os

magicbot/inject.py

@@ -1,5 +1,5 @@
 import logging
-from typing import Any, Dict, Optional
+from typing import Any, Optional
 
 logger = logging.getLogger(__name__)
 
@@ -9,8 +9,8 @@ class MagicInjectError(ValueError):
 
 
 def get_injection_requests(
-    type_hints: Dict[str, type], cname: str, component: Optional[Any] = None
-) -> Dict[str, type]:
+    type_hints: dict[str, type], cname: str, component: Optional[Any] = None
+) -> dict[str, type]:
     """
     Given a dict of type hints, filter it to the requested injection types.
 
@@ -52,8 +52,8 @@ def get_injection_requests(
 
 
 def find_injections(
-    requests: Dict[str, type], injectables: Dict[str, Any], cname: str
-) -> Dict[str, Any]:
+    requests: dict[str, type], injectables: dict[str, Any], cname: str
+) -> dict[str, Any]:
     """
     Get a dict of the variables to inject into a given component.
 

magicbot/magic_reset.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict, Generic, TypeVar
+from typing import Any, Generic, TypeVar
 
 V = TypeVar("V")
 
@@ -36,7 +36,7 @@ def __init__(self, default: V) -> None:
         self.default = default
 
 
-def collect_resets(cls: type) -> Dict[str, Any]:
+def collect_resets(cls: type) -> dict[str, Any]:
     """
     Get all the ``will_reset_to`` variables and their values from a class.
 

magicbot/magic_tunable.py

@@ -3,7 +3,8 @@
 import inspect
 import typing
 import warnings
-from typing import Callable, Generic, Optional, Sequence, TypeVar, Union, overload
+from typing import Callable, Generic, Optional, TypeVar, Union, overload
+from collections.abc import Sequence
 
 import ntcore
 from ntcore import NetworkTableInstance

magicbot/magicrobot.py

@@ -5,7 +5,7 @@
 import types
 import typing
 
-from typing import Any, Callable, Dict, List, Tuple
+from typing import Any, Callable
 
 import hal
 import wpilib
@@ -72,9 +72,9 @@ def __init__(self) -> None:
 
         self.__last_error_report = -10
 
-        self._components: List[Tuple[str, Any]] = []
-        self._feedbacks: List[Tuple[Callable[[], Any], Callable[[Any], Any]]] = []
-        self._reset_components: List[Tuple[Dict[str, Any], Any]] = []
+        self._components: list[tuple[str, Any]] = []
+        self._feedbacks: list[tuple[Callable[[], Any], Callable[[Any], Any]]] = []
+        self._reset_components: list[tuple[dict[str, Any], Any]] = []
 
         self.__done = False
 
@@ -125,7 +125,7 @@ def robotInit(self) -> None:
 
         self.watchdog = SimpleWatchdog(self.control_loop_wait_time)
 
-        self.__periodics: List[Tuple[Callable[[], None], str]] = [
+        self.__periodics: list[tuple[Callable[[], None], str]] = [
             (self.robotPeriodic, "robotPeriodic()"),
         ]
 
@@ -397,7 +397,7 @@ def autonomous(self) -> None:
         except:
             self.onException(forceReport=True)
 
-        auto_functions: Tuple[Callable[[], None], ...] = (self._enabled_periodic,)
+        auto_functions: tuple[Callable[[], None], ...] = (self._enabled_periodic,)
 
         if self.use_teleop_in_autonomous:
             auto_functions = (self.teleopPeriodic,) + auto_functions
@@ -649,7 +649,7 @@ def _create_components(self) -> None:
 
         self._components = components
 
-    def _collect_injectables(self) -> Dict[str, Any]:
+    def _collect_injectables(self) -> dict[str, Any]:
         injectables = {}
         cls = type(self)
 
@@ -672,7 +672,7 @@ def _collect_injectables(self) -> Dict[str, Any]:
 
         return injectables
 
-    def _create_component(self, name: str, ctyp: type, injectables: Dict[str, Any]):
+    def _create_component(self, name: str, ctyp: type, injectables: dict[str, Any]):
         type_hints = typing.get_type_hints(ctyp.__init__)
         NoneType = type(None)
         init_return_type = type_hints.pop("return", NoneType)
@@ -699,7 +699,7 @@ def _create_component(self, name: str, ctyp: type, injectables: Dict[str, Any]):
 
         return component
 
-    def _setup_vars(self, cname: str, component, injectables: Dict[str, Any]) -> None:
+    def _setup_vars(self, cname: str, component, injectables: dict[str, Any]) -> None:
         self.logger.debug("Injecting magic variables into %s", cname)
 
         type_hints = typing.get_type_hints(type(component))

magicbot/state_machine.py

@@ -4,13 +4,12 @@
     Any,
     Callable,
     ClassVar,
-    Dict,
     NoReturn,
     Optional,
-    Sequence,
     Union,
     overload,
 )
+from collections.abc import Sequence
 
 import wpilib
 
@@ -260,7 +259,7 @@ def default_state(f: StateMethod) -> _State:
     return _State(f, first=False, must_finish=True, is_default=True)
 
 
-def _get_class_members(cls: type) -> Dict[str, Any]:
+def _get_class_members(cls: type) -> dict[str, Any]:
     """Get the members of the given class in definition order, bases first."""
     d = {}
     for cls in reversed(cls.__mro__):

robotpy_ext/autonomous/selector.py

@@ -3,7 +3,8 @@
 import logging
 import os
 from glob import glob
-from typing import Callable, Sequence, Union
+from typing import Callable, Union
+from collections.abc import Sequence
 
 import hal
 import wpilib

robotpy_ext/common_drivers/driver_base.py

@@ -1,4 +1,4 @@
-class DriverBase(object):
+class DriverBase:
     """
     This should be the base class for all drivers in the cdl,
     currently all it does is spit out a warning message if the driver has not been verified.

robotpy_ext/common_drivers/units.py

@@ -1,4 +1,4 @@
-class Unit(object):
+class Unit:
     """The class for all of the units here"""
 
     def __init__(self, base_unit, base_to_unit, unit_to_base):

robotpy_ext/misc/simple_watchdog.py

@@ -1,6 +1,5 @@
 import wpilib
 import logging
-from typing import List, Tuple
 
 logger = logging.getLogger("simple_watchdog")
 
@@ -38,7 +37,7 @@ def __init__(self, timeout: float):
         self._expirationTime = 0  # us
         self._lastTimeoutPrintTime = 0  # us
         self._lastEpochsPrintTime = 0  # us
-        self._epochs: List[Tuple[str, int]] = []
+        self._epochs: list[tuple[str, int]] = []
 
     def getTime(self) -> float:
         """Returns the time in seconds since the watchdog was last fed."""