Modernize Node type hints

Author: bengineerd

python/pyrogue/_Node.py

@@ -20,7 +20,7 @@
 import re
 import sys
 from collections import OrderedDict as odict
-from typing import Any, Callable, Iterable, List, Optional, Tuple
+from typing import Any, Callable, Iterable, Optional
 
 import pyrogue as pr
 
@@ -323,10 +323,10 @@ def __getattr__(self, name: str) -> Any:
             raise AttributeError('{} has no attribute {}'.format(self, name))
 
 
-    def __dir__(self) -> List[str]:
+    def __dir__(self) -> list[str]:
         return super().__dir__() + [k for k,v in self._nodes.items()]
 
-    def __reduce__(self) -> Tuple[Any, Tuple[dict]]:
+    def __reduce__(self) -> tuple[Any, tuple[dict]]:
         attr = {}
 
         attr['name']        = self._name
@@ -465,7 +465,7 @@ def addNodes(self, nodeClass: Callable[..., Any], number: int, stride: int, **kw
             self.add(nodeClass(name='{:s}[{:d}]'.format(name, i), offset=offset+(i*stride), **kwargs))
 
     @property
-    def nodeList(self) -> List[Any]:
+    def nodeList(self) -> list[Any]:
         """Return a recursive list of nodes."""
         lst = []
         for key,value in self._nodes.items():
@@ -521,7 +521,7 @@ def variablesByGroup(self, incGroups: Optional[list[str]] = None, excGroups: Opt
         return self.getNodes(typ=pr.BaseVariable,excTyp=pr.BaseCommand,incGroups=incGroups,excGroups=excGroups)
 
     @property
-    def variableList(self) -> List[Any]:
+    def variableList(self) -> list[Any]:
         """Return a recursive list of variables and commands."""
         lst = []
         for key,value in self.nodes.items():
@@ -550,7 +550,7 @@ def devicesByGroup(self, incGroups: Optional[list[str]] = None, excGroups: Optio
         return self.getNodes(pr.Device,incGroups=incGroups,excGroups=excGroups)
 
     @property
-    def deviceList(self) -> List[Any]:
+    def deviceList(self) -> list[Any]:
         """Return a recursive list of devices."""
         lst = []
         for key,value in self.nodes.items():
@@ -597,7 +597,7 @@ def isCommand(self) -> bool:
         """Return True if this node is a command."""
         return self.isinstance(pr.BaseCommand)
 
-    def find(self, *, recurse: bool = True, typ: Optional[Any] = None, **kwargs: Any) -> List[Any]:
+    def find(self, *, recurse: bool = True, typ: Optional[Any] = None, **kwargs: Any) -> list[Any]:
         """
         Find all child nodes that are a base class of 'typ'
         and whose properties match all of the kwargs.
@@ -718,7 +718,7 @@ def _finishInit(self):
     def getYaml(
         self,
         readFirst: bool = False,
-        modes: List[str] = ['RW','RO','WO'],
+        modes: list[str] = ['RW','RO','WO'],
         incGroups: Optional[list[str]] = None,
         excGroups: Optional[list[str]] = ['Hidden'],
         recurse: bool = True,
@@ -750,7 +750,7 @@ def getYaml(
     def printYaml(
         self,
         readFirst: bool = False,
-        modes: List[str] = ['RW','RO','WO'],
+        modes: list[str] = ['RW','RO','WO'],
         incGroups: Optional[list[str]] = None,
         excGroups: Optional[list[str]] = ['Hidden'],
         recurse: bool = False,
@@ -862,7 +862,7 @@ def _setTimeout(self,timeout):
         """
         pass
 
-    def nodeMatch(self, name: str) -> Tuple[List[Any], Optional[List[str]]]:
+    def nodeMatch(self, name: str) -> tuple[list[Any], Optional[list[str]]]:
         """Match a node name, including array-style accessors.
 
         Parameters
@@ -902,7 +902,7 @@ def nodeMatch(self, name: str) -> Tuple[List[Any], Optional[List[str]]]:
             return _iterateDict(self._anodes[aname],keys),None
 
 
-def _iterateDict(d: dict, keys: List[str]) -> List[Any]:
+def _iterateDict(d: dict, keys: list[str]) -> list[Any]:
     """Iterate into a nested dict using array-style keys."""
     retList = []
 
@@ -943,7 +943,7 @@ def _iterateDict(d: dict, keys: List[str]) -> List[Any]:
     return retList
 
 
-def genBaseList(cls: Any) -> List[str]:
+def genBaseList(cls: Any) -> list[str]:
     """Return a list of base class names for a class."""
     ret = [str(cls)]
 

python/pyrogue/_RunControl.py

@@ -14,7 +14,7 @@
 #-----------------------------------------------------------------------------
 import threading
 import time
-from typing import Any, Callable, Dict, Optional
+from typing import Any, Callable, Optional
 
 import pyrogue as pr
 
@@ -40,8 +40,8 @@ def __init__(
         self,
         *,
         hidden: bool = True,
-        rates: Optional[Dict[int, str]] = None,
-        states: Optional[Dict[int, str]] = None,
+        rates: Optional[dict[int, str]] = None,
+        states: Optional[dict[int, str]] = None,
         cmd: Optional[Callable[[], None]] = None,
         **kwargs: Any,
     ) -> None:

python/pyrogue/_Variable.py

@@ -20,7 +20,7 @@
 import sys
 import threading
 import time
-from typing import Any, Callable, List, Optional
+from typing import Any, Callable, Optional
 
 import numpy as np
 import pyrogue as pr
@@ -79,7 +79,7 @@ class VariableWaitClass(object):
     def __init__(
         self,
         varList: Any,
-        testFunction: Optional[Callable[[List[Any]], bool]] = None,
+        testFunction: Optional[Callable[[list[Any]], bool]] = None,
         timeout: float = 0,
     ) -> None:
         self._values   = odict()
@@ -142,7 +142,7 @@ def _check(self) -> bool:
 
 def VariableWait(
     varList: Any,
-    testFunction: Optional[Callable[[List[Any]], bool]] = None,
+    testFunction: Optional[Callable[[list[Any]], bool]] = None,
     timeout: float = 0,
 ) -> bool:
     """