odxtools 9.7.0__py3-none-any.whl → 10.0.0__py3-none-any.whl

odxtools/diaglayers/diaglayer.py

@@ -1,9 +1,10 @@
 # SPDX-License-Identifier: MIT
+from collections.abc import Callable, Iterable
 from copy import copy, deepcopy
 from dataclasses import dataclass
 from functools import cached_property
 from itertools import chain
-from typing import Any, Callable, Dict, Iterable, List, Optional, Union, cast
+from typing import Any, Union, cast
 from xml.etree import ElementTree
 
 from ..admindata import AdminData
@@ -29,7 +30,7 @@ from ..unitgroup import UnitGroup
 from .diaglayerraw import DiagLayerRaw
 from .diaglayertype import DiagLayerType
 
-PrefixTree = Dict[int, Union[List[DiagService], "PrefixTree"]]
+PrefixTree = dict[int, Union[list[DiagService], "PrefixTree"]]
 
 
 @dataclass
@@ -44,7 +45,7 @@ class DiagLayer:
     diag_layer_raw: DiagLayerRaw
 
     @staticmethod
-    def from_et(et_element: ElementTree.Element, doc_frags: List[OdxDocFragment]) -> "DiagLayer":
+    def from_et(et_element: ElementTree.Element, doc_frags: list[OdxDocFragment]) -> "DiagLayer":
         diag_layer_raw = DiagLayerRaw.from_et(et_element, doc_frags)
 
         # Create DiagLayer
@@ -72,7 +73,7 @@ class DiagLayer:
         else:
             self._diag_data_dictionary_spec = self.diag_layer_raw.diag_data_dictionary_spec
 
-    def _build_odxlinks(self) -> Dict[OdxLinkId, Any]:
+    def _build_odxlinks(self) -> dict[OdxLinkId, Any]:
         """Construct a mapping from IDs to all objects that are contained in this diagnostic layer."""
         result = self.diag_layer_raw._build_odxlinks()
 
@@ -91,7 +92,7 @@ class DiagLayer:
         # reference. This mechanism can thus be seen as a kind of
         # "poor man's inheritance".
         if self.import_refs:
-            imported_links: Dict[OdxLinkId, Any] = {}
+            imported_links: dict[OdxLinkId, Any] = {}
             for import_ref in self.import_refs:
                 imported_dl = odxlinks.resolve(import_ref, DiagLayer)
 
@@ -168,7 +169,7 @@ class DiagLayer:
         """
         return get_local_objects(self)
 
-    def __deepcopy__(self, memo: Dict[int, Any]) -> Any:
+    def __deepcopy__(self, memo: dict[int, Any]) -> Any:
         """Create a deep copy of the diagnostic layer
 
         Note that the copied diagnostic layer is not fully
@@ -210,15 +211,15 @@ class DiagLayer:
         return self.diag_layer_raw.short_name
 
     @property
-    def long_name(self) -> Optional[str]:
+    def long_name(self) -> str | None:
         return self.diag_layer_raw.long_name
 
     @property
-    def description(self) -> Optional[Description]:
+    def description(self) -> Description | None:
         return self.diag_layer_raw.description
 
     @property
-    def admin_data(self) -> Optional[AdminData]:
+    def admin_data(self) -> AdminData | None:
         return self.diag_layer_raw.admin_data
 
     @property
@@ -258,7 +259,7 @@ class DiagLayer:
         return self.diag_layer_raw.global_negative_responses
 
     @property
-    def import_refs(self) -> List[OdxLinkRef]:
+    def import_refs(self) -> list[OdxLinkRef]:
         return self.diag_layer_raw.import_refs
 
     @property
@@ -270,7 +271,7 @@ class DiagLayer:
         return self.diag_layer_raw.sub_components
 
     @property
-    def sdgs(self) -> List[SpecialDataGroup]:
+    def sdgs(self) -> list[SpecialDataGroup]:
         return self.diag_layer_raw.sdgs
 
     @property
@@ -359,13 +360,13 @@ class DiagLayer:
         if sub_tree.get(-1) is None:
             sub_tree[-1] = [service]
         else:
-            cast(List[DiagService], sub_tree[-1]).append(service)
+            cast(list[DiagService], sub_tree[-1]).append(service)
 
-    def _find_services_for_uds(self, message: bytes) -> List[DiagService]:
+    def _find_services_for_uds(self, message: bytes) -> list[DiagService]:
         prefix_tree = self._prefix_tree
 
         # Find matching service(s) in prefix tree
-        possible_services: List[DiagService] = []
+        possible_services: list[DiagService] = []
         for b in message:
             if b in prefix_tree:
                 odxassert(isinstance(prefix_tree[b], dict))
@@ -373,11 +374,11 @@ class DiagLayer:
             else:
                 break
             if -1 in prefix_tree:
-                possible_services += cast(List[DiagService], prefix_tree[-1])
+                possible_services += cast(list[DiagService], prefix_tree[-1])
         return possible_services
 
-    def _decode(self, message: bytes, candidate_services: Iterable[DiagService]) -> List[Message]:
-        decoded_messages: List[Message] = []
+    def _decode(self, message: bytes, candidate_services: Iterable[DiagService]) -> list[Message]:
+        decoded_messages: list[Message] = []
 
         for service in candidate_services:
             try:
@@ -415,12 +416,12 @@ class DiagLayer:
 
         return decoded_messages
 
-    def decode(self, message: bytes) -> List[Message]:
+    def decode(self, message: bytes) -> list[Message]:
         candidate_services = self._find_services_for_uds(message)
 
         return self._decode(message, candidate_services)
 
-    def decode_response(self, response: bytes, request: bytes) -> List[Message]:
+    def decode_response(self, response: bytes, request: bytes) -> list[Message]:
         candidate_services = self._find_services_for_uds(request)
         if candidate_services is None:
             raise DecodeError(f"Couldn't find corresponding service for request {request.hex()}.")

odxtools/diaglayers/diaglayerraw.py

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: MIT
 from copy import copy
 from dataclasses import dataclass
-from typing import Any, Dict, List, Optional, Union, cast
+from typing import Any, cast
 from xml.etree import ElementTree
 
 from ..additionalaudience import AdditionalAudience
@@ -36,21 +36,21 @@ class DiagLayerRaw(IdentifiableElement):
     """
 
     variant_type: DiagLayerType
-    admin_data: Optional[AdminData]
+    admin_data: AdminData | None
     company_datas: NamedItemList[CompanyData]
     functional_classes: NamedItemList[FunctionalClass]
-    diag_data_dictionary_spec: Optional[DiagDataDictionarySpec]
-    diag_comms_raw: List[Union[OdxLinkRef, DiagComm]]
+    diag_data_dictionary_spec: DiagDataDictionarySpec | None
+    diag_comms_raw: list[OdxLinkRef | DiagComm]
     requests: NamedItemList[Request]
     positive_responses: NamedItemList[Response]
     negative_responses: NamedItemList[Response]
     global_negative_responses: NamedItemList[Response]
-    import_refs: List[OdxLinkRef]
+    import_refs: list[OdxLinkRef]
     state_charts: NamedItemList[StateChart]
     additional_audiences: NamedItemList[AdditionalAudience]
     sub_components: NamedItemList[SubComponent]
     libraries: NamedItemList[Library]
-    sdgs: List[SpecialDataGroup]
+    sdgs: list[SpecialDataGroup]
 
     @property
     def diag_comms(self) -> NamedItemList[DiagComm]:
@@ -70,7 +70,7 @@ class DiagLayerRaw(IdentifiableElement):
         return self._single_ecu_jobs
 
     @staticmethod
-    def from_et(et_element: ElementTree.Element, doc_frags: List[OdxDocFragment]) -> "DiagLayerRaw":
+    def from_et(et_element: ElementTree.Element, doc_frags: list[OdxDocFragment]) -> "DiagLayerRaw":
         try:
             variant_type = DiagLayerType(et_element.tag)
         except ValueError:
@@ -102,10 +102,10 @@ class DiagLayerRaw(IdentifiableElement):
         if (ddds_elem := et_element.find("DIAG-DATA-DICTIONARY-SPEC")) is not None:
             diag_data_dictionary_spec = DiagDataDictionarySpec.from_et(ddds_elem, doc_frags)
 
-        diag_comms_raw: List[Union[OdxLinkRef, DiagComm]] = []
+        diag_comms_raw: list[OdxLinkRef | DiagComm] = []
         if (dc_elems := et_element.find("DIAG-COMMS")) is not None:
             for dc_proxy_elem in dc_elems:
-                dc: Union[OdxLinkRef, DiagComm]
+                dc: OdxLinkRef | DiagComm
                 if dc_proxy_elem.tag == "DIAG-COMM-REF":
                     dc = OdxLinkRef.from_et(dc_proxy_elem, doc_frags)
                 elif dc_proxy_elem.tag == "DIAG-SERVICE":
@@ -183,7 +183,7 @@ class DiagLayerRaw(IdentifiableElement):
             sdgs=sdgs,
             **kwargs)
 
-    def _build_odxlinks(self) -> Dict[OdxLinkId, Any]:
+    def _build_odxlinks(self) -> dict[OdxLinkId, Any]:
         """Construct a mapping from IDs to all objects that are contained in this diagnostic layer."""
         odxlinks = {self.odx_id: self}
 

odxtools/diaglayers/diaglayertype.py

@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: MIT
 from enum import Enum
-from typing import Dict
 
 
 class DiagLayerType(Enum):
@@ -19,7 +18,7 @@ class DiagLayerType(Enum):
 
         """
 
-        PRIORITY_OF_DIAG_LAYER_TYPE: Dict[DiagLayerType, int] = {
+        PRIORITY_OF_DIAG_LAYER_TYPE: dict[DiagLayerType, int] = {
             DiagLayerType.PROTOCOL:
                 1,
             DiagLayerType.FUNCTIONAL_GROUP:

odxtools/diaglayers/ecushareddata.py

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: MIT
 from copy import deepcopy
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any, Dict, List, Union, cast
+from typing import TYPE_CHECKING, Any, cast
 from xml.etree import ElementTree
 
 from ..diagvariable import DiagVariable
@@ -27,7 +27,7 @@ class EcuSharedData(DiagLayer):
         return cast(EcuSharedDataRaw, self.diag_layer_raw)
 
     @property
-    def diag_variables_raw(self) -> List[Union[OdxLinkRef, DiagVariable]]:
+    def diag_variables_raw(self) -> list[OdxLinkRef | DiagVariable]:
         return self.ecu_shared_data_raw.diag_variables_raw
 
     @property
@@ -40,7 +40,7 @@ class EcuSharedData(DiagLayer):
 
     @staticmethod
     def from_et(et_element: ElementTree.Element,
-                doc_frags: List[OdxDocFragment]) -> "EcuSharedData":
+                doc_frags: list[OdxDocFragment]) -> "EcuSharedData":
         ecu_shared_data_raw = EcuSharedDataRaw.from_et(et_element, doc_frags)
 
         return EcuSharedData(diag_layer_raw=ecu_shared_data_raw)
@@ -78,7 +78,7 @@ class EcuSharedData(DiagLayer):
         self._resolve_snrefs(context)
         context.diag_layer = None
 
-    def __deepcopy__(self, memo: Dict[int, Any]) -> Any:
+    def __deepcopy__(self, memo: dict[int, Any]) -> Any:
         """Create a deep copy of the protocol layer
 
         Note that the copied diagnostic layer is not fully

odxtools/diaglayers/ecushareddataraw.py

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: MIT
 from dataclasses import dataclass
-from typing import Any, Dict, List, Union
+from typing import Any
 from xml.etree import ElementTree
 
 from ..diagvariable import DiagVariable
@@ -18,7 +18,7 @@ class EcuSharedDataRaw(DiagLayerRaw):
     """This is a diagnostic layer for data shared accross others
     """
 
-    diag_variables_raw: List[Union[DiagVariable, OdxLinkRef]]
+    diag_variables_raw: list[DiagVariable | OdxLinkRef]
     variable_groups: NamedItemList[VariableGroup]
 
     @property
@@ -27,7 +27,7 @@ class EcuSharedDataRaw(DiagLayerRaw):
 
     @staticmethod
     def from_et(et_element: ElementTree.Element,
-                doc_frags: List[OdxDocFragment]) -> "EcuSharedDataRaw":
+                doc_frags: list[OdxDocFragment]) -> "EcuSharedDataRaw":
         # objects contained by diagnostic layers exibit an additional
         # document fragment for the diag layer, so we use the document
         # fragments of the odx id of the diag layer for IDs of
@@ -36,10 +36,10 @@ class EcuSharedDataRaw(DiagLayerRaw):
         kwargs = dataclass_fields_asdict(dlr)
         doc_frags = dlr.odx_id.doc_fragments
 
-        diag_variables_raw: List[Union[DiagVariable, OdxLinkRef]] = []
+        diag_variables_raw: list[DiagVariable | OdxLinkRef] = []
         if (dv_elems := et_element.find("DIAG-VARIABLES")) is not None:
             for dv_proxy_elem in dv_elems:
-                dv_proxy: Union[OdxLinkRef, DiagVariable]
+                dv_proxy: OdxLinkRef | DiagVariable
                 if dv_proxy_elem.tag == "DIAG-VARIABLE-REF":
                     dv_proxy = OdxLinkRef.from_et(dv_proxy_elem, doc_frags)
                 elif dv_proxy_elem.tag == "DIAG-VARIABLE":
@@ -58,7 +58,7 @@ class EcuSharedDataRaw(DiagLayerRaw):
         return EcuSharedDataRaw(
             diag_variables_raw=diag_variables_raw, variable_groups=variable_groups, **kwargs)
 
-    def _build_odxlinks(self) -> Dict[OdxLinkId, Any]:
+    def _build_odxlinks(self) -> dict[OdxLinkId, Any]:
         result = super()._build_odxlinks()
         for dv_proxy in self.diag_variables_raw:
             if not isinstance(dv_proxy, OdxLinkRef):

odxtools/diaglayers/ecuvariant.py

@@ -1,7 +1,8 @@
 # SPDX-License-Identifier: MIT
+from collections.abc import Iterable
 from copy import deepcopy
 from dataclasses import dataclass
-from typing import Any, Dict, Iterable, List, Optional, Union, cast
+from typing import Any, cast
 from xml.etree import ElementTree
 
 from typing_extensions import override
@@ -28,19 +29,19 @@ class EcuVariant(HierarchyElement):
         return cast(EcuVariantRaw, self.diag_layer_raw)
 
     @property
-    def diag_variables_raw(self) -> List[Union[DiagVariable, OdxLinkRef]]:
+    def diag_variables_raw(self) -> list[DiagVariable | OdxLinkRef]:
         return self.ecu_variant_raw.diag_variables_raw
 
     @property
-    def dyn_defined_spec(self) -> Optional[DynDefinedSpec]:
+    def dyn_defined_spec(self) -> DynDefinedSpec | None:
         return self.ecu_variant_raw.dyn_defined_spec
 
     @property
-    def parent_refs(self) -> List[ParentRef]:
+    def parent_refs(self) -> list[ParentRef]:
         return self.ecu_variant_raw.parent_refs
 
     @property
-    def base_variant(self) -> Optional[BaseVariant]:
+    def base_variant(self) -> BaseVariant | None:
         """Return the base variant for the ECU variant
 
         The ODX specification allows at a single base variant for each
@@ -55,7 +56,7 @@ class EcuVariant(HierarchyElement):
         return None
 
     @property
-    def ecu_variant_patterns(self) -> List[EcuVariantPattern]:
+    def ecu_variant_patterns(self) -> list[EcuVariantPattern]:
         return self.ecu_variant_raw.ecu_variant_patterns
 
     #######
@@ -74,7 +75,7 @@ class EcuVariant(HierarchyElement):
     #######
 
     @staticmethod
-    def from_et(et_element: ElementTree.Element, doc_frags: List[OdxDocFragment]) -> "EcuVariant":
+    def from_et(et_element: ElementTree.Element, doc_frags: list[OdxDocFragment]) -> "EcuVariant":
         ecu_variant_raw = EcuVariantRaw.from_et(et_element, doc_frags)
 
         return EcuVariant(diag_layer_raw=ecu_variant_raw)
@@ -87,7 +88,7 @@ class EcuVariant(HierarchyElement):
             "The raw diagnostic layer passed to EcuVariant "
             "must be a EcuVariantRaw")
 
-    def __deepcopy__(self, memo: Dict[int, Any]) -> Any:
+    def __deepcopy__(self, memo: dict[int, Any]) -> Any:
         """Create a deep copy of the ECU variant
 
         Note that the copied diagnostic layer is not fully
@@ -120,7 +121,7 @@ class EcuVariant(HierarchyElement):
 
             return dl.diag_layer_raw.diag_variables
 
-        def not_inherited_fn(parent_ref: ParentRef) -> List[str]:
+        def not_inherited_fn(parent_ref: ParentRef) -> list[str]:
             return parent_ref.not_inherited_variables
 
         return self._compute_available_objects(get_local_objects_fn, not_inherited_fn)
@@ -134,7 +135,7 @@ class EcuVariant(HierarchyElement):
 
             return dl.diag_layer_raw.variable_groups
 
-        def not_inherited_fn(parent_ref: ParentRef) -> List[str]:
+        def not_inherited_fn(parent_ref: ParentRef) -> list[str]:
             return []
 
         return self._compute_available_objects(get_local_objects_fn, not_inherited_fn)

odxtools/diaglayers/ecuvariantraw.py

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: MIT
 from dataclasses import dataclass
-from typing import Any, Dict, List, Optional, Union
+from typing import Any
 from xml.etree import ElementTree
 
 from ..diagvariable import DiagVariable
@@ -18,11 +18,11 @@ from .hierarchyelementraw import HierarchyElementRaw
 
 @dataclass
 class EcuVariantRaw(HierarchyElementRaw):
-    diag_variables_raw: List[Union[DiagVariable, OdxLinkRef]]
+    diag_variables_raw: list[DiagVariable | OdxLinkRef]
     variable_groups: NamedItemList[VariableGroup]
-    ecu_variant_patterns: List[EcuVariantPattern]
-    dyn_defined_spec: Optional[DynDefinedSpec]
-    parent_refs: List[ParentRef]
+    ecu_variant_patterns: list[EcuVariantPattern]
+    dyn_defined_spec: DynDefinedSpec | None
+    parent_refs: list[ParentRef]
 
     @property
     def diag_variables(self) -> NamedItemList[DiagVariable]:
@@ -30,7 +30,7 @@ class EcuVariantRaw(HierarchyElementRaw):
 
     @staticmethod
     def from_et(et_element: ElementTree.Element,
-                doc_frags: List[OdxDocFragment]) -> "EcuVariantRaw":
+                doc_frags: list[OdxDocFragment]) -> "EcuVariantRaw":
         # objects contained by diagnostic layers exibit an additional
         # document fragment for the diag layer, so we use the document
         # fragments of the odx id of the diag layer for IDs of
@@ -39,10 +39,10 @@ class EcuVariantRaw(HierarchyElementRaw):
         kwargs = dataclass_fields_asdict(her)
         doc_frags = her.odx_id.doc_fragments
 
-        diag_variables_raw: List[Union[DiagVariable, OdxLinkRef]] = []
+        diag_variables_raw: list[DiagVariable | OdxLinkRef] = []
         if (dv_elems := et_element.find("DIAG-VARIABLES")) is not None:
             for dv_proxy_elem in dv_elems:
-                dv_proxy: Union[OdxLinkRef, DiagVariable]
+                dv_proxy: OdxLinkRef | DiagVariable
                 if dv_proxy_elem.tag == "DIAG-VARIABLE-REF":
                     dv_proxy = OdxLinkRef.from_et(dv_proxy_elem, doc_frags)
                 elif dv_proxy_elem.tag == "DIAG-VARIABLE":
@@ -81,7 +81,7 @@ class EcuVariantRaw(HierarchyElementRaw):
             parent_refs=parent_refs,
             **kwargs)
 
-    def _build_odxlinks(self) -> Dict[OdxLinkId, Any]:
+    def _build_odxlinks(self) -> dict[OdxLinkId, Any]:
         result = super()._build_odxlinks()
 
         for dv_proxy in self.diag_variables_raw:

odxtools/diaglayers/functionalgroup.py

@@ -1,7 +1,8 @@
 # SPDX-License-Identifier: MIT
+from collections.abc import Iterable
 from copy import deepcopy
 from dataclasses import dataclass
-from typing import Any, Dict, Iterable, List, Union, cast
+from typing import Any, cast
 from xml.etree import ElementTree
 
 from typing_extensions import override
@@ -27,7 +28,7 @@ class FunctionalGroup(HierarchyElement):
         return cast(FunctionalGroupRaw, self.diag_layer_raw)
 
     @property
-    def diag_variables_raw(self) -> List[Union[DiagVariable, OdxLinkRef]]:
+    def diag_variables_raw(self) -> list[DiagVariable | OdxLinkRef]:
         return self.functional_group_raw.diag_variables_raw
 
     @property
@@ -39,12 +40,12 @@ class FunctionalGroup(HierarchyElement):
         return self._variable_groups
 
     @property
-    def parent_refs(self) -> List[ParentRef]:
+    def parent_refs(self) -> list[ParentRef]:
         return self.functional_group_raw.parent_refs
 
     @staticmethod
     def from_et(et_element: ElementTree.Element,
-                doc_frags: List[OdxDocFragment]) -> "FunctionalGroup":
+                doc_frags: list[OdxDocFragment]) -> "FunctionalGroup":
         functional_group_raw = FunctionalGroupRaw.from_et(et_element, doc_frags)
 
         return FunctionalGroup(diag_layer_raw=functional_group_raw)
@@ -73,7 +74,7 @@ class FunctionalGroup(HierarchyElement):
 
             return dl.diag_layer_raw.diag_variables  # type: ignore[no-any-return]
 
-        def not_inherited_fn(parent_ref: ParentRef) -> List[str]:
+        def not_inherited_fn(parent_ref: ParentRef) -> list[str]:
             return parent_ref.not_inherited_variables
 
         return self._compute_available_objects(get_local_objects_fn, not_inherited_fn)
@@ -87,12 +88,12 @@ class FunctionalGroup(HierarchyElement):
 
             return dl.diag_layer_raw.variable_groups  # type: ignore[no-any-return]
 
-        def not_inherited_fn(parent_ref: ParentRef) -> List[str]:
+        def not_inherited_fn(parent_ref: ParentRef) -> list[str]:
             return []
 
         return self._compute_available_objects(get_local_objects_fn, not_inherited_fn)
 
-    def __deepcopy__(self, memo: Dict[int, Any]) -> Any:
+    def __deepcopy__(self, memo: dict[int, Any]) -> Any:
         """Create a deep copy of the functional group layer
 
         Note that the copied diagnostic layer is not fully

odxtools/diaglayers/functionalgroupraw.py

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: MIT
 from dataclasses import dataclass
-from typing import Any, Dict, List, Union
+from typing import Any
 from xml.etree import ElementTree
 
 from ..diagvariable import DiagVariable
@@ -19,9 +19,9 @@ class FunctionalGroupRaw(HierarchyElementRaw):
     """This is a diagnostic layer for common functionality of an ECU
     """
 
-    diag_variables_raw: List[Union[DiagVariable, OdxLinkRef]]
+    diag_variables_raw: list[DiagVariable | OdxLinkRef]
     variable_groups: NamedItemList[VariableGroup]
-    parent_refs: List[ParentRef]
+    parent_refs: list[ParentRef]
 
     @property
     def diag_variables(self) -> NamedItemList[DiagVariable]:
@@ -29,7 +29,7 @@ class FunctionalGroupRaw(HierarchyElementRaw):
 
     @staticmethod
     def from_et(et_element: ElementTree.Element,
-                doc_frags: List[OdxDocFragment]) -> "FunctionalGroupRaw":
+                doc_frags: list[OdxDocFragment]) -> "FunctionalGroupRaw":
         # objects contained by diagnostic layers exibit an additional
         # document fragment for the diag layer, so we use the document
         # fragments of the odx id of the diag layer for IDs of
@@ -38,10 +38,10 @@ class FunctionalGroupRaw(HierarchyElementRaw):
         kwargs = dataclass_fields_asdict(her)
         doc_frags = her.odx_id.doc_fragments
 
-        diag_variables_raw: List[Union[DiagVariable, OdxLinkRef]] = []
+        diag_variables_raw: list[DiagVariable | OdxLinkRef] = []
         if (dv_elems := et_element.find("DIAG-VARIABLES")) is not None:
             for dv_proxy_elem in dv_elems:
-                dv_proxy: Union[OdxLinkRef, DiagVariable]
+                dv_proxy: OdxLinkRef | DiagVariable
                 if dv_proxy_elem.tag == "DIAG-VARIABLE-REF":
                     dv_proxy = OdxLinkRef.from_et(dv_proxy_elem, doc_frags)
                 elif dv_proxy_elem.tag == "DIAG-VARIABLE":
@@ -67,7 +67,7 @@ class FunctionalGroupRaw(HierarchyElementRaw):
             parent_refs=parent_refs,
             **kwargs)
 
-    def _build_odxlinks(self) -> Dict[OdxLinkId, Any]:
+    def _build_odxlinks(self) -> dict[OdxLinkId, Any]:
         result = super()._build_odxlinks()
 
         for dv_proxy in self.diag_variables_raw: