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

odxtools/cli/main.py

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: MIT
 import argparse
 import importlib
-from typing import Any, List
+from typing import Any
 
 import odxtools
 import odxtools.exceptions
@@ -11,7 +11,7 @@ from .dummy_sub_parser import DummyTool
 
 # import the tool modules which can be loaded. if a tool
 # can't be loaded, add a dummy one
-tool_modules: List[Any] = []
+tool_modules: list[Any] = []
 for tool_name in ["list", "browse", "snoop", "find", "decode", "compare"]:
     try:
         tool_modules.append(importlib.import_module(f".{tool_name}", package="odxtools.cli"))

odxtools/cli/snoop.py

@@ -4,7 +4,7 @@
 import argparse
 import asyncio
 import sys
-from typing import Any, List, Optional, Type
+from typing import Any
 
 import can
 
@@ -103,7 +103,7 @@ def handle_telegram(telegram_id: int, payload: bytes) -> None:
               f"({payload!r}, {len(payload)} bytes)")
 
 
-def init_verbose_state_machine(BaseClass: Type[IsoTpStateMachine], *args: Any,
+def init_verbose_state_machine(BaseClass: type[IsoTpStateMachine], *args: Any,
                                **kwargs: Any) -> IsoTpStateMachine:
 
     class InformativeIsoTpDecoder(BaseClass):  # type: ignore[valid-type, misc]
@@ -246,7 +246,7 @@ def run(args: argparse.Namespace) -> None:
 
     protocol_name = args.protocol
     if odx_diag_layer is not None and protocol_name is not None:
-        protocols: Optional[List[Protocol]] = getattr(odx_diag_layer, "protocols", None)
+        protocols: list[Protocol] | None = getattr(odx_diag_layer, "protocols", None)
 
         if protocols is None:
             print(f"ECU variant {odx_diag_layer.short_name} is of type "

odxtools/codec.py

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: MIT
 import typing
-from typing import Optional, runtime_checkable
+from typing import runtime_checkable
 
 from .decodestate import DecodeState
 from .encodestate import EncodeState
@@ -17,12 +17,12 @@ class Codec(typing.Protocol):
     def short_name(self) -> str:
         return ""
 
-    def encode_into_pdu(self, physical_value: Optional[ParameterValue],
+    def encode_into_pdu(self, physical_value: ParameterValue | None,
                         encode_state: EncodeState) -> None:
         ...
 
     def decode_from_pdu(self, decode_state: DecodeState) -> ParameterValue:
         ...
 
-    def get_static_bit_length(self) -> Optional[int]:
+    def get_static_bit_length(self) -> int | None:
         ...

odxtools/commrelation.py

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: MIT
 import warnings
 from dataclasses import dataclass
-from typing import Any, Dict, List, Optional
+from typing import Any
 from xml.etree import ElementTree
 
 from .commrelationvaluetype import CommRelationValueType
@@ -16,26 +16,26 @@ from .snrefcontext import SnRefContext
 
 @dataclass
 class CommRelation:
-    description: Optional[Description]
+    description: Description | None
     relation_type: str
-    diag_comm_ref: Optional[OdxLinkRef]
-    diag_comm_snref: Optional[str]
-    in_param_if_snref: Optional[str]
+    diag_comm_ref: OdxLinkRef | None
+    diag_comm_snref: str | None
+    in_param_if_snref: str | None
     #in_param_if_snpathref: Optional[str] # TODO
-    out_param_if_snref: Optional[str]
+    out_param_if_snref: str | None
     #out_param_if_snpathref: Optional[str] # TODO
-    value_type_raw: Optional[CommRelationValueType]
+    value_type_raw: CommRelationValueType | None
 
     @property
     def diag_comm(self) -> DiagComm:
         return self._diag_comm
 
     @property
-    def in_param_if(self) -> Optional[Parameter]:
+    def in_param_if(self) -> Parameter | None:
         return self._in_param_if
 
     @property
-    def out_param_if(self) -> Optional[Parameter]:
+    def out_param_if(self) -> Parameter | None:
         return self._out_param_if
 
     @property
@@ -46,7 +46,7 @@ class CommRelation:
         return self.value_type_raw
 
     @staticmethod
-    def from_et(et_element: ElementTree.Element, doc_frags: List[OdxDocFragment]) -> "CommRelation":
+    def from_et(et_element: ElementTree.Element, doc_frags: list[OdxDocFragment]) -> "CommRelation":
         description = Description.from_et(et_element.find("DESC"), doc_frags)
         relation_type = odxrequire(et_element.findtext("RELATION-TYPE"))
 
@@ -85,7 +85,7 @@ class CommRelation:
             out_param_if_snref=out_param_if_snref,
             value_type_raw=value_type_raw)
 
-    def _build_odxlinks(self) -> Dict[OdxLinkId, Any]:
+    def _build_odxlinks(self) -> dict[OdxLinkId, Any]:
         return {}
 
     def _resolve_odxlinks(self, odxlinks: OdxLinkDatabase) -> None:

odxtools/companydata.py

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: MIT
 from dataclasses import dataclass
-from typing import Any, Dict, List, Optional
+from typing import Any
 from xml.etree import ElementTree
 
 from .companyspecificinfo import CompanySpecificInfo
@@ -15,12 +15,12 @@ from .utils import dataclass_fields_asdict
 
 @dataclass
 class CompanyData(IdentifiableElement):
-    roles: List[str]
+    roles: list[str]
     team_members: NamedItemList[TeamMember]
-    company_specific_info: Optional[CompanySpecificInfo]
+    company_specific_info: CompanySpecificInfo | None
 
     @staticmethod
-    def from_et(et_element: ElementTree.Element, doc_frags: List[OdxDocFragment]) -> "CompanyData":
+    def from_et(et_element: ElementTree.Element, doc_frags: list[OdxDocFragment]) -> "CompanyData":
 
         kwargs = dataclass_fields_asdict(IdentifiableElement.from_et(et_element, doc_frags))
 
@@ -43,7 +43,7 @@ class CompanyData(IdentifiableElement):
             **kwargs,
         )
 
-    def _build_odxlinks(self) -> Dict[OdxLinkId, Any]:
+    def _build_odxlinks(self) -> dict[OdxLinkId, Any]:
         result = {self.odx_id: self}
 
         for tm in self.team_members:

odxtools/companydocinfo.py

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: MIT
 from dataclasses import dataclass
-from typing import Any, Dict, List, Optional
+from typing import Any
 from xml.etree import ElementTree
 
 from .companydata import CompanyData
@@ -14,21 +14,21 @@ from .teammember import TeamMember
 @dataclass
 class CompanyDocInfo:
     company_data_ref: OdxLinkRef
-    team_member_ref: Optional[OdxLinkRef]
-    doc_label: Optional[str]
-    sdgs: List[SpecialDataGroup]
+    team_member_ref: OdxLinkRef | None
+    doc_label: str | None
+    sdgs: list[SpecialDataGroup]
 
     @property
     def company_data(self) -> CompanyData:
         return self._company_data
 
     @property
-    def team_member(self) -> Optional[TeamMember]:
+    def team_member(self) -> TeamMember | None:
         return self._team_member
 
     @staticmethod
     def from_et(et_element: ElementTree.Element,
-                doc_frags: List[OdxDocFragment]) -> "CompanyDocInfo":
+                doc_frags: list[OdxDocFragment]) -> "CompanyDocInfo":
         # the company data reference is mandatory
         company_data_ref = odxrequire(
             OdxLinkRef.from_et(et_element.find("COMPANY-DATA-REF"), doc_frags))
@@ -45,7 +45,7 @@ class CompanyDocInfo:
             sdgs=sdgs,
         )
 
-    def _build_odxlinks(self) -> Dict[OdxLinkId, Any]:
+    def _build_odxlinks(self) -> dict[OdxLinkId, Any]:
         result = {}
 
         for sdg in self.sdgs:
@@ -56,7 +56,7 @@ class CompanyDocInfo:
     def _resolve_odxlinks(self, odxlinks: OdxLinkDatabase) -> None:
         self._company_data = odxlinks.resolve(self.company_data_ref, CompanyData)
 
-        self._team_member: Optional[TeamMember] = None
+        self._team_member: TeamMember | None = None
         if self.team_member_ref is not None:
             self._team_member = odxlinks.resolve(self.team_member_ref, TeamMember)
 

odxtools/companyrevisioninfo.py

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: MIT
 from dataclasses import dataclass
-from typing import Any, Dict, List, Optional
+from typing import Any
 from xml.etree import ElementTree
 
 from .companydata import CompanyData
@@ -12,8 +12,8 @@ from .snrefcontext import SnRefContext
 @dataclass
 class CompanyRevisionInfo:
     company_data_ref: OdxLinkRef
-    revision_label: Optional[str]
-    state: Optional[str]
+    revision_label: str | None
+    state: str | None
 
     @property
     def company_data(self) -> CompanyData:
@@ -21,7 +21,7 @@ class CompanyRevisionInfo:
 
     @staticmethod
     def from_et(et_element: ElementTree.Element,
-                doc_frags: List[OdxDocFragment]) -> "CompanyRevisionInfo":
+                doc_frags: list[OdxDocFragment]) -> "CompanyRevisionInfo":
 
         company_data_ref = odxrequire(
             OdxLinkRef.from_et(et_element.find("COMPANY-DATA-REF"), doc_frags))
@@ -31,7 +31,7 @@ class CompanyRevisionInfo:
         return CompanyRevisionInfo(
             company_data_ref=company_data_ref, revision_label=revision_label, state=state)
 
-    def _build_odxlinks(self) -> Dict[OdxLinkId, Any]:
+    def _build_odxlinks(self) -> dict[OdxLinkId, Any]:
         return {}
 
     def _resolve_odxlinks(self, odxlinks: OdxLinkDatabase) -> None:

odxtools/companyspecificinfo.py

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: MIT
 from dataclasses import dataclass
-from typing import Any, Dict, List
+from typing import Any
 from xml.etree import ElementTree
 
 from .odxlink import OdxDocFragment, OdxLinkDatabase, OdxLinkId
@@ -11,12 +11,12 @@ from .specialdatagroup import SpecialDataGroup
 
 @dataclass
 class CompanySpecificInfo:
-    related_docs: List[RelatedDoc]
-    sdgs: List[SpecialDataGroup]
+    related_docs: list[RelatedDoc]
+    sdgs: list[SpecialDataGroup]
 
     @staticmethod
     def from_et(et_element: ElementTree.Element,
-                doc_frags: List[OdxDocFragment]) -> "CompanySpecificInfo":
+                doc_frags: list[OdxDocFragment]) -> "CompanySpecificInfo":
         related_docs = [
             RelatedDoc.from_et(rd, doc_frags)
             for rd in et_element.iterfind("RELATED-DOCS/RELATED-DOC")
@@ -28,7 +28,7 @@ class CompanySpecificInfo:
 
         return CompanySpecificInfo(related_docs=related_docs, sdgs=sdgs)
 
-    def _build_odxlinks(self) -> Dict[OdxLinkId, Any]:
+    def _build_odxlinks(self) -> dict[OdxLinkId, Any]:
         result = {}
 
         for rd in self.related_docs:

odxtools/comparam.py

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: MIT
 from dataclasses import dataclass
-from typing import Any, Dict, List
+from typing import Any
 from xml.etree import ElementTree
 
 from .basecomparam import BaseComparam
@@ -27,7 +27,7 @@ class Comparam(BaseComparam):
         return self._dop
 
     @staticmethod
-    def from_et(et_element: ElementTree.Element, doc_frags: List[OdxDocFragment]) -> "Comparam":
+    def from_et(et_element: ElementTree.Element, doc_frags: list[OdxDocFragment]) -> "Comparam":
         kwargs = dataclass_fields_asdict(BaseComparam.from_et(et_element, doc_frags))
 
         physical_default_value_raw = odxrequire(et_element.findtext("PHYSICAL-DEFAULT-VALUE"))
@@ -36,7 +36,7 @@ class Comparam(BaseComparam):
         return Comparam(
             dop_ref=dop_ref, physical_default_value_raw=physical_default_value_raw, **kwargs)
 
-    def _build_odxlinks(self) -> Dict[OdxLinkId, Any]:
+    def _build_odxlinks(self) -> dict[OdxLinkId, Any]:
         return super()._build_odxlinks()
 
     def _resolve_odxlinks(self, odxlinks: OdxLinkDatabase) -> None:

odxtools/comparaminstance.py

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: MIT
 import warnings
 from dataclasses import dataclass
-from typing import Any, Dict, List, Optional, Union
+from typing import Any
 from xml.etree import ElementTree
 
 from .basecomparam import BaseComparam
@@ -20,10 +20,10 @@ class ComparamInstance:
 
     Be aware that the ODX specification calls this class COMPARAM-REF!
     """
-    value: Union[str, ComplexValue]
-    description: Optional[Description]
-    protocol_snref: Optional[str]
-    prot_stack_snref: Optional[str]
+    value: str | ComplexValue
+    description: Description | None
+    protocol_snref: str | None
+    prot_stack_snref: str | None
     spec_ref: OdxLinkRef
 
     @property
@@ -36,13 +36,13 @@ class ComparamInstance:
 
     @staticmethod
     def from_et(et_element: ElementTree.Element,
-                doc_frags: List[OdxDocFragment]) -> "ComparamInstance":
+                doc_frags: list[OdxDocFragment]) -> "ComparamInstance":
         spec_ref = odxrequire(OdxLinkRef.from_et(et_element, doc_frags))
 
         # ODX standard v2.0.0 defined only VALUE. ODX v2.0.1 decided
         # to break things and change it to a choice between SIMPLE-VALUE
         # and COMPLEX-VALUE
-        value: Union[str, List[Union[str, ComplexValue]]]
+        value: str | list[str | ComplexValue]
         if et_element.find("VALUE") is not None:
             value = odxrequire(et_element.findtext("VALUE"))
         elif et_element.find("SIMPLE-VALUE") is not None:
@@ -68,7 +68,7 @@ class ComparamInstance:
             prot_stack_snref=prot_stack_snref,
         )
 
-    def _build_odxlinks(self) -> Dict[OdxLinkId, Any]:
+    def _build_odxlinks(self) -> dict[OdxLinkId, Any]:
         return {}
 
     def _resolve_odxlinks(self, odxlinks: OdxLinkDatabase) -> None:
@@ -98,7 +98,7 @@ class ComparamInstance:
 
         return result
 
-    def get_subvalue(self, subparam_name: str) -> Optional[str]:
+    def get_subvalue(self, subparam_name: str) -> str | None:
         """Retrieve the value of a complex communication parameter's sub-parameter by name
 
         This takes the default value of the comparam (if any) into
@@ -133,7 +133,7 @@ class ComparamInstance:
             return None
 
         result = value_list[idx]
-        if result is None and isinstance(subparam, (Comparam, ComplexComparam)):
+        if result is None and isinstance(subparam, Comparam | ComplexComparam):
             result = subparam.physical_default_value
         if not isinstance(result, str):
             odxraise()

odxtools/comparamspec.py

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: MIT
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any, Dict, List
+from typing import TYPE_CHECKING, Any
 from xml.etree import ElementTree
 
 from .nameditemlist import NamedItemList
@@ -20,7 +20,7 @@ class ComparamSpec(OdxCategory):
     prot_stacks: NamedItemList[ProtStack]
 
     @staticmethod
-    def from_et(et_element: ElementTree.Element, doc_frags: List[OdxDocFragment]) -> "ComparamSpec":
+    def from_et(et_element: ElementTree.Element, doc_frags: list[OdxDocFragment]) -> "ComparamSpec":
 
         base_obj = OdxCategory.category_from_et(
             et_element, doc_frags, doc_type=DocType.COMPARAM_SPEC)
@@ -34,7 +34,7 @@ class ComparamSpec(OdxCategory):
 
         return ComparamSpec(prot_stacks=prot_stacks, **kwargs)
 
-    def _build_odxlinks(self) -> Dict[OdxLinkId, Any]:
+    def _build_odxlinks(self) -> dict[OdxLinkId, Any]:
         odxlinks = super()._build_odxlinks()
 
         for ps in self.prot_stacks:

odxtools/comparamsubset.py

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: MIT
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any, Dict, List, Optional
+from typing import TYPE_CHECKING, Any
 from xml.etree import ElementTree
 
 from .comparam import Comparam
@@ -22,12 +22,12 @@ class ComparamSubset(OdxCategory):
     comparams: NamedItemList[Comparam]
     complex_comparams: NamedItemList[ComplexComparam]
     data_object_props: NamedItemList[DataObjectProperty]
-    unit_spec: Optional[UnitSpec]
-    category: Optional[str]  # mandatory in ODX 2.2, but non-existent in ODX 2.0
+    unit_spec: UnitSpec | None
+    category: str | None  # mandatory in ODX 2.2, but non-existent in ODX 2.0
 
     @staticmethod
     def from_et(et_element: ElementTree.Element,
-                doc_frags: List[OdxDocFragment]) -> "ComparamSubset":
+                doc_frags: list[OdxDocFragment]) -> "ComparamSubset":
 
         category_attrib = et_element.attrib.get("CATEGORY")
 
@@ -64,7 +64,7 @@ class ComparamSubset(OdxCategory):
             unit_spec=unit_spec,
             **kwargs)
 
-    def _build_odxlinks(self) -> Dict[OdxLinkId, Any]:
+    def _build_odxlinks(self) -> dict[OdxLinkId, Any]:
         odxlinks = super()._build_odxlinks()
 
         for comparam in self.comparams:

odxtools/complexcomparam.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, Union
 from xml.etree import ElementTree
 
 from .basecomparam import BaseComparam
@@ -10,7 +10,7 @@ from .odxtypes import odxstr_to_bool
 from .snrefcontext import SnRefContext
 from .utils import dataclass_fields_asdict
 
-ComplexValue = List[Union[str, "ComplexValue"]]
+ComplexValue = list[Union[str, "ComplexValue"]]
 
 
 def create_complex_value_from_et(et_element: ElementTree.Element) -> ComplexValue:
@@ -26,8 +26,8 @@ def create_complex_value_from_et(et_element: ElementTree.Element) -> ComplexValu
 @dataclass
 class ComplexComparam(BaseComparam):
     subparams: NamedItemList[BaseComparam]
-    physical_default_value: Optional[ComplexValue]
-    allow_multiple_values_raw: Optional[bool]
+    physical_default_value: ComplexValue | None
+    allow_multiple_values_raw: bool | None
 
     @property
     def allow_multiple_values(self) -> bool:
@@ -35,7 +35,7 @@ class ComplexComparam(BaseComparam):
 
     @staticmethod
     def from_et(et_element: ElementTree.Element,
-                doc_frags: List[OdxDocFragment]) -> "ComplexComparam":
+                doc_frags: list[OdxDocFragment]) -> "ComplexComparam":
         kwargs = dataclass_fields_asdict(BaseComparam.from_et(et_element, doc_frags))
 
         # to avoid a cyclic import, create_any_comparam_from_et cannot
@@ -68,7 +68,7 @@ class ComplexComparam(BaseComparam):
         # extract the complex physical default value. (what's the
         # purpose of this? the sub-parameters can define their own
         # default values if a default is desired...)
-        complex_physical_default_value: Optional[ComplexValue] = None
+        complex_physical_default_value: ComplexValue | None = None
         if (cpdv_elem := et_element.find("COMPLEX-PHYSICAL-DEFAULT-VALUE")) is not None:
             complex_physical_default_value = create_complex_value_from_et(cpdv_elem)
 
@@ -80,7 +80,7 @@ class ComplexComparam(BaseComparam):
             allow_multiple_values_raw=allow_multiple_values_raw,
             **kwargs)
 
-    def _build_odxlinks(self) -> Dict[OdxLinkId, Any]:
+    def _build_odxlinks(self) -> dict[OdxLinkId, Any]:
         odxlinks = super()._build_odxlinks()
         for subparam in self.subparams:
             odxlinks.update(subparam._build_odxlinks())

odxtools/compositecodec.py

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: MIT
 import typing
-from typing import List, Optional, runtime_checkable
+from typing import runtime_checkable
 
 from .codec import Codec
 from .decodestate import DecodeState
@@ -22,20 +22,20 @@ class CompositeCodec(Codec, typing.Protocol):
     """
 
     @property
-    def parameters(self) -> List[Parameter]:
+    def parameters(self) -> list[Parameter]:
         return []
 
     @property
-    def required_parameters(self) -> List[Parameter]:
+    def required_parameters(self) -> list[Parameter]:
         return []
 
     @property
-    def free_parameters(self) -> List[Parameter]:
+    def free_parameters(self) -> list[Parameter]:
         return []
 
 
 # some helper functions useful for composite codec objects
-def composite_codec_get_static_bit_length(codec: CompositeCodec) -> Optional[int]:
+def composite_codec_get_static_bit_length(codec: CompositeCodec) -> int | None:
     """Compute the length of a composite codec object in bits
 
     This is basically the sum of the lengths of all parameters. If the
@@ -59,7 +59,7 @@ def composite_codec_get_static_bit_length(codec: CompositeCodec) -> Optional[int
     return byte_length * 8
 
 
-def composite_codec_get_required_parameters(codec: CompositeCodec) -> List[Parameter]:
+def composite_codec_get_required_parameters(codec: CompositeCodec) -> list[Parameter]:
     """Return the list of parameters which are required to be
     specified for encoding the composite codec object
 
@@ -68,7 +68,7 @@ def composite_codec_get_required_parameters(codec: CompositeCodec) -> List[Param
     return [p for p in codec.parameters if p.is_required]
 
 
-def composite_codec_get_free_parameters(codec: CompositeCodec) -> List[Parameter]:
+def composite_codec_get_free_parameters(codec: CompositeCodec) -> list[Parameter]:
     """Return the list of parameters which can be freely specified by
     the user when encoding the composite codec object
 
@@ -84,7 +84,7 @@ def composite_codec_get_coded_const_prefix(codec: CompositeCodec,
 
     for param in codec.parameters:
         if (isinstance(param, MatchingRequestParameter) and param.request_byte_position < len(request_prefix)) or \
-            isinstance(param, (CodedConstParameter, PhysicalConstantParameter)):
+            isinstance(param, CodedConstParameter|PhysicalConstantParameter) :
             param.encode_into_pdu(physical_value=None, encode_state=encode_state)
         else:
             break
@@ -92,7 +92,7 @@ def composite_codec_get_coded_const_prefix(codec: CompositeCodec,
     return encode_state.coded_message
 
 
-def composite_codec_encode_into_pdu(codec: CompositeCodec, physical_value: Optional[ParameterValue],
+def composite_codec_encode_into_pdu(codec: CompositeCodec, physical_value: ParameterValue | None,
                                     encode_state: EncodeState) -> None:
     from .parameters.lengthkeyparameter import LengthKeyParameter
     from .parameters.tablekeyparameter import TableKeyParameter
@@ -132,7 +132,7 @@ def composite_codec_encode_into_pdu(codec: CompositeCodec, physical_value: Optio
             # the ODX is located last in the PDU...
             encode_state.is_end_of_pdu = orig_is_end_of_pdu
 
-        if isinstance(param, (LengthKeyParameter, TableKeyParameter)):
+        if isinstance(param, LengthKeyParameter | TableKeyParameter):
             # At this point, we encode a placeholder value for length-
             # and table keys, since these can be specified
             # implicitly (i.e., by means of parameters that use
@@ -159,7 +159,7 @@ def composite_codec_encode_into_pdu(codec: CompositeCodec, physical_value: Optio
     # because we allow these to be defined implicitly (i.e. they
     # are defined by their respective users)
     for param in codec.parameters:
-        if not isinstance(param, (LengthKeyParameter, TableKeyParameter)):
+        if not isinstance(param, LengthKeyParameter | TableKeyParameter):
             # the current parameter is neither a length- nor a table key
             continue
 

odxtools/compumethods/compucodecompumethod.py

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: MIT
 from dataclasses import dataclass
-from typing import List, Optional, cast
+from typing import cast
 from xml.etree import ElementTree
 
 from ..exceptions import DecodeError, EncodeError, odxassert, odxraise
@@ -20,21 +20,21 @@ class CompuCodeCompuMethod(CompuMethod):
     """
 
     @property
-    def internal_to_phys_code(self) -> Optional[ProgCode]:
+    def internal_to_phys_code(self) -> ProgCode | None:
         if self.compu_internal_to_phys is None:
             return None
 
         return self.compu_internal_to_phys.prog_code
 
     @property
-    def phys_to_internal_code(self) -> Optional[ProgCode]:
+    def phys_to_internal_code(self) -> ProgCode | None:
         if self.compu_phys_to_internal is None:
             return None
 
         return self.compu_phys_to_internal.prog_code
 
     @staticmethod
-    def compu_method_from_et(et_element: ElementTree.Element, doc_frags: List[OdxDocFragment], *,
+    def compu_method_from_et(et_element: ElementTree.Element, doc_frags: list[OdxDocFragment], *,
                              internal_type: DataType,
                              physical_type: DataType) -> "CompuCodeCompuMethod":
         cm = CompuMethod.compu_method_from_et(

odxtools/compumethods/compuconst.py

@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: MIT
 from dataclasses import dataclass
-from typing import Optional
 from xml.etree import ElementTree
 
 from ..odxtypes import AtomicOdxType, DataType
@@ -8,13 +7,13 @@ from ..odxtypes import AtomicOdxType, DataType
 
 @dataclass
 class CompuConst:
-    v: Optional[str]
-    vt: Optional[str]
+    v: str | None
+    vt: str | None
 
     data_type: DataType
 
     @property
-    def value(self) -> Optional[AtomicOdxType]:
+    def value(self) -> AtomicOdxType | None:
         return self._value
 
     @staticmethod
@@ -26,6 +25,6 @@ class CompuConst:
         return CompuConst(v=v, vt=vt, data_type=data_type)
 
     def __post_init__(self) -> None:
-        self._value: Optional[AtomicOdxType] = self.vt
+        self._value: AtomicOdxType | None = self.vt
         if self.v is not None:
             self._value = self.data_type.from_string(self.v)

odxtools/compumethods/compudefaultvalue.py

@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: MIT
 from dataclasses import dataclass
-from typing import Optional
 from xml.etree import ElementTree
 
 from ..odxtypes import DataType
@@ -11,7 +10,7 @@ from .compuinversevalue import CompuInverseValue
 
 @dataclass
 class CompuDefaultValue(CompuConst):
-    compu_inverse_value: Optional[CompuInverseValue]
+    compu_inverse_value: CompuInverseValue | None
 
     @staticmethod
     def compuvalue_from_et(et_element: ElementTree.Element, *,