Typing improvements

Author: timsavage

src/odin/annotated_resource/__init__.py

@@ -12,7 +12,7 @@
 
 """
 
-from typing import Any, Dict, Iterable, Tuple, Type
+from collections.abc import Iterable
 
 from odin import registration
 from odin.fields import BaseField
@@ -35,8 +35,9 @@
 )
 
 
-def _iterate_attrs(attrs: Dict[str, Any]) -> Iterable[Tuple[str, BaseField]]:
+def _iterate_attrs(attrs: dict[str, ...]) -> Iterable[tuple[str, BaseField]]:
     """Iterate through attributes and combine with annotations."""
+
     annotations = attrs.pop("__annotations__", None) or {}
 
     # Yield any annotations processed into field instances
@@ -56,7 +57,7 @@ def __new__(
         name: str,
         bases,
         attrs: dict,
-        meta_options_type: Type[MOT] = ResourceOptions,
+        meta_options_type: type[MOT] = ResourceOptions,
         abstract: bool = False,
     ):
         super_new = super().__new__
@@ -92,8 +93,8 @@ def __new__(
             return r
 
         # Add all field attributes to the class.
-        for name, field in _iterate_attrs(attrs):
-            new_class.add_to_class(name, field)
+        for field_name, field in _iterate_attrs(attrs):
+            new_class.add_to_class(field_name, field)
 
         _add_parent_fields_to_class(new_class, new_meta, parents)
 

src/odin/annotated_resource/type_aliases.py

@@ -1,5 +1,7 @@
 """Type aliases for string formatted types."""
-from typing import Any, Callable, Sequence, Tuple, Union
+
+from collections.abc import Callable, Sequence
+from typing import Any
 
 __all__ = (
     "Email",
@@ -12,11 +14,7 @@
 )
 
 Validator = Callable[[Any], None]
-Choices = Union[
-    Sequence[Any],
-    Sequence[Tuple[str, Any]],
-    Sequence[Tuple[str, Any, str]],
-]
+Choices = Sequence[Any] | Sequence[tuple[str, Any]] | Sequence[tuple[str, Any, str]]
 
 
 class Email(str):

src/odin/contrib/sphinx/__init__.py

@@ -6,7 +6,7 @@
 from sphinx.ext.autodoc import (
     Documenter,
     ModuleLevelDocumenter,
-    ObjectMembers,
+    ObjectMember,
     bool_option,
 )
 from sphinx.util import logging
@@ -145,7 +145,7 @@ def build_field_triple(self, field) -> tuple:
             "\n".join(details).split("\n"),  # Details
         )
 
-    def get_object_members(self, want_all: bool) -> tuple[bool, ObjectMembers]:
+    def get_object_members(self, want_all: bool) -> tuple[bool, ObjectMember]:
         pass  # Not required; this implementation replaces the document_members method that calls get_object_members
 
     def document_members(self, all_members: bool = False) -> None: