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

odxtools/parameters/nrcconstparameter.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 typing_extensions import override
@@ -34,7 +34,7 @@ class NrcConstParameter(Parameter):
 
     """
 
-    coded_values_raw: List[str]
+    coded_values_raw: list[str]
     diag_coded_type: DiagCodedType
 
     @property
@@ -57,13 +57,13 @@ class NrcConstParameter(Parameter):
         return self.diag_coded_type.base_data_type
 
     @property
-    def coded_values(self) -> List[AtomicOdxType]:
+    def coded_values(self) -> list[AtomicOdxType]:
         return self._coded_values
 
     @staticmethod
     @override
     def from_et(et_element: ElementTree.Element,
-                doc_frags: List[OdxDocFragment]) -> "NrcConstParameter":
+                doc_frags: list[OdxDocFragment]) -> "NrcConstParameter":
 
         kwargs = dataclass_fields_asdict(Parameter.from_et(et_element, doc_frags))
 
@@ -82,7 +82,7 @@ class NrcConstParameter(Parameter):
         ]
 
     @override
-    def _build_odxlinks(self) -> Dict[OdxLinkId, Any]:
+    def _build_odxlinks(self) -> dict[OdxLinkId, Any]:
         result = super()._build_odxlinks()
 
         result.update(self.diag_coded_type._build_odxlinks())
@@ -90,11 +90,11 @@ class NrcConstParameter(Parameter):
         return result
 
     @override
-    def get_static_bit_length(self) -> Optional[int]:
+    def get_static_bit_length(self) -> int | None:
         return self.diag_coded_type.get_static_bit_length()
 
     @override
-    def _encode_positioned_into_pdu(self, physical_value: Optional[ParameterValue],
+    def _encode_positioned_into_pdu(self, physical_value: ParameterValue | None,
                                     encode_state: EncodeState) -> None:
         # NRC-CONST parameters are not encoding any value on its
         # own. instead, it is supposed to overlap with a value

odxtools/parameters/parameter.py

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: MIT
 from dataclasses import dataclass
-from typing import Any, Dict, List, Literal, Optional
+from typing import Any, Literal
 from xml.etree import ElementTree
 
 from typing_extensions import final, override
@@ -42,11 +42,11 @@ class Parameter(NamedElement):
     non-positionable parameter types.
 
     """
-    sdgs: List[SpecialDataGroup]
-    semantic: Optional[str]
-    oid: Optional[str]
-    byte_position: Optional[int]
-    bit_position: Optional[int]
+    sdgs: list[SpecialDataGroup]
+    semantic: str | None
+    oid: str | None
+    byte_position: int | None
+    bit_position: int | None
 
     @property
     def parameter_type(self) -> ParameterType:
@@ -78,7 +78,7 @@ class Parameter(NamedElement):
 
     @staticmethod
     @override
-    def from_et(et_element: ElementTree.Element, doc_frags: List[OdxDocFragment]) -> "Parameter":
+    def from_et(et_element: ElementTree.Element, doc_frags: list[OdxDocFragment]) -> "Parameter":
 
         kwargs = dataclass_fields_asdict(NamedElement.from_et(et_element, doc_frags))
 
@@ -100,7 +100,7 @@ class Parameter(NamedElement):
             bit_position=bit_position,
             **kwargs)
 
-    def _build_odxlinks(self) -> Dict[OdxLinkId, Any]:
+    def _build_odxlinks(self) -> dict[OdxLinkId, Any]:
         result = {}
 
         for sdg in self.sdgs:
@@ -116,11 +116,11 @@ class Parameter(NamedElement):
         for sdg in self.sdgs:
             sdg._resolve_snrefs(context)
 
-    def get_static_bit_length(self) -> Optional[int]:
+    def get_static_bit_length(self) -> int | None:
         return None
 
     @final
-    def encode_into_pdu(self, physical_value: Optional[ParameterValue],
+    def encode_into_pdu(self, physical_value: ParameterValue | None,
                         encode_state: EncodeState) -> None:
         """Convert a physical value into its encoded form and place it
         into the PDU
@@ -140,7 +140,7 @@ class Parameter(NamedElement):
 
         encode_state.cursor_bit_position = 0
 
-    def _encode_positioned_into_pdu(self, physical_value: Optional[ParameterValue],
+    def _encode_positioned_into_pdu(self, physical_value: ParameterValue | None,
                                     encode_state: EncodeState) -> None:
         """Method which actually encodes the parameter
 

odxtools/parameters/parameterwithdop.py

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: MIT
 from dataclasses import dataclass
-from typing import Any, Dict, List, Optional, cast
+from typing import Any, cast
 from xml.etree import ElementTree
 
 from typing_extensions import override
@@ -21,8 +21,8 @@ from .parameter import Parameter
 
 @dataclass
 class ParameterWithDOP(Parameter):
-    dop_ref: Optional[OdxLinkRef]
-    dop_snref: Optional[str]
+    dop_ref: OdxLinkRef | None
+    dop_snref: str | None
 
     @property
     def dop(self) -> DopBase:
@@ -33,7 +33,7 @@ class ParameterWithDOP(Parameter):
     @staticmethod
     @override
     def from_et(et_element: ElementTree.Element,
-                doc_frags: List[OdxDocFragment]) -> "ParameterWithDOP":
+                doc_frags: list[OdxDocFragment]) -> "ParameterWithDOP":
 
         kwargs = dataclass_fields_asdict(Parameter.from_et(et_element, doc_frags))
 
@@ -50,7 +50,7 @@ class ParameterWithDOP(Parameter):
         self._dop: DopBase
 
     @override
-    def _build_odxlinks(self) -> Dict[OdxLinkId, Any]:
+    def _build_odxlinks(self) -> dict[OdxLinkId, Any]:
         return super()._build_odxlinks()
 
     @override
@@ -70,21 +70,21 @@ class ParameterWithDOP(Parameter):
             self._dop = resolve_snref(self.dop_snref, ddds.all_data_object_properties, DopBase)
 
     @override
-    def get_static_bit_length(self) -> Optional[int]:
+    def get_static_bit_length(self) -> int | None:
         if self._dop is not None:
             return self._dop.get_static_bit_length()
         else:
             return None
 
     @property
-    def physical_type(self) -> Optional[PhysicalType]:
-        if isinstance(self.dop, (DataObjectProperty, DtcDop)):
+    def physical_type(self) -> PhysicalType | None:
+        if isinstance(self.dop, DataObjectProperty | DtcDop):
             return self.dop.physical_type
         else:
             return None
 
     @override
-    def _encode_positioned_into_pdu(self, physical_value: Optional[ParameterValue],
+    def _encode_positioned_into_pdu(self, physical_value: ParameterValue | None,
                                     encode_state: EncodeState) -> None:
         self.dop.encode_into_pdu(cast(AtomicOdxType, physical_value), encode_state)
 

odxtools/parameters/physicalconstantparameter.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 typing_extensions import override
@@ -43,7 +43,7 @@ class PhysicalConstantParameter(ParameterWithDOP):
     @staticmethod
     @override
     def from_et(et_element: ElementTree.Element,
-                doc_frags: List[OdxDocFragment]) -> "PhysicalConstantParameter":
+                doc_frags: list[OdxDocFragment]) -> "PhysicalConstantParameter":
 
         kwargs = dataclass_fields_asdict(ParameterWithDOP.from_et(et_element, doc_frags))
 
@@ -53,7 +53,7 @@ class PhysicalConstantParameter(ParameterWithDOP):
             physical_constant_value_raw=physical_constant_value_raw, **kwargs)
 
     @override
-    def _build_odxlinks(self) -> Dict[OdxLinkId, Any]:
+    def _build_odxlinks(self) -> dict[OdxLinkId, Any]:
         return super()._build_odxlinks()
 
     @override
@@ -72,7 +72,7 @@ class PhysicalConstantParameter(ParameterWithDOP):
         self._physical_constant_value = base_data_type.from_string(self.physical_constant_value_raw)
 
     @override
-    def _encode_positioned_into_pdu(self, physical_value: Optional[ParameterValue],
+    def _encode_positioned_into_pdu(self, physical_value: ParameterValue | None,
                                     encode_state: EncodeState) -> None:
         if physical_value is not None and physical_value != self.physical_constant_value:
             odxraise(

odxtools/parameters/reservedparameter.py

@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: MIT
 from dataclasses import dataclass
-from typing import List, Optional
 from xml.etree import ElementTree
 
 from typing_extensions import override
@@ -36,7 +35,7 @@ class ReservedParameter(Parameter):
     @staticmethod
     @override
     def from_et(et_element: ElementTree.Element,
-                doc_frags: List[OdxDocFragment]) -> "ReservedParameter":
+                doc_frags: list[OdxDocFragment]) -> "ReservedParameter":
         kwargs = dataclass_fields_asdict(Parameter.from_et(et_element, doc_frags))
 
         bit_length = int(odxrequire(et_element.findtext("BIT-LENGTH")))
@@ -44,11 +43,11 @@ class ReservedParameter(Parameter):
         return ReservedParameter(bit_length=bit_length, **kwargs)
 
     @override
-    def get_static_bit_length(self) -> Optional[int]:
+    def get_static_bit_length(self) -> int | None:
         return self.bit_length
 
     @override
-    def _encode_positioned_into_pdu(self, physical_value: Optional[ParameterValue],
+    def _encode_positioned_into_pdu(self, physical_value: ParameterValue | None,
                                     encode_state: EncodeState) -> None:
         encode_state.cursor_byte_position += (encode_state.cursor_bit_position + self.bit_length +
                                               7) // 8

odxtools/parameters/rowfragment.py

@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: MIT
+from enum import Enum
+
+
+class RowFragment(Enum):
+    KEY = "KEY"
+    STRUCT = "STRUCT"

odxtools/parameters/systemparameter.py

@@ -2,7 +2,6 @@
 import getpass
 from dataclasses import dataclass
 from datetime import datetime
-from typing import List, Optional
 from xml.etree import ElementTree
 
 from typing_extensions import override
@@ -50,7 +49,7 @@ class SystemParameter(ParameterWithDOP):
     @staticmethod
     @override
     def from_et(et_element: ElementTree.Element,
-                doc_frags: List[OdxDocFragment]) -> "SystemParameter":
+                doc_frags: list[OdxDocFragment]) -> "SystemParameter":
         kwargs = dataclass_fields_asdict(ParameterWithDOP.from_et(et_element, doc_frags))
 
         sysparam = odxrequire(et_element.get("SYSPARAM"))
@@ -58,7 +57,7 @@ class SystemParameter(ParameterWithDOP):
         return SystemParameter(sysparam=sysparam, **kwargs)
 
     @override
-    def _encode_positioned_into_pdu(self, physical_value: Optional[ParameterValue],
+    def _encode_positioned_into_pdu(self, physical_value: ParameterValue | None,
                                     encode_state: EncodeState) -> None:
         if physical_value is None:
             # determine the value to be encoded automatically

odxtools/parameters/tableentryparameter.py

@@ -1,7 +1,6 @@
 # SPDX-License-Identifier: MIT
 from dataclasses import dataclass
-from enum import Enum
-from typing import TYPE_CHECKING, List, Optional, cast
+from typing import TYPE_CHECKING, cast
 from xml.etree import ElementTree
 
 from typing_extensions import override
@@ -13,16 +12,12 @@ from ..odxlink import OdxDocFragment, OdxLinkDatabase, OdxLinkRef
 from ..odxtypes import ParameterValue
 from ..utils import dataclass_fields_asdict
 from .parameter import Parameter, ParameterType
+from .rowfragment import RowFragment
 
 if TYPE_CHECKING:
     from ..tablerow import TableRow
 
 
-class RowFragment(Enum):
-    KEY = "KEY"
-    STRUCT = "STRUCT"
-
-
 @dataclass
 class TableEntryParameter(Parameter):
     target: RowFragment
@@ -50,7 +45,7 @@ class TableEntryParameter(Parameter):
     @staticmethod
     @override
     def from_et(et_element: ElementTree.Element,
-                doc_frags: List[OdxDocFragment]) -> "TableEntryParameter":
+                doc_frags: list[OdxDocFragment]) -> "TableEntryParameter":
         kwargs = dataclass_fields_asdict(Parameter.from_et(et_element, doc_frags))
 
         target_str = odxrequire(et_element.findtext("TARGET"))
@@ -73,7 +68,7 @@ class TableEntryParameter(Parameter):
             self._table_row = odxlinks.resolve(self.table_row_ref)
 
     @override
-    def _encode_positioned_into_pdu(self, physical_value: Optional[ParameterValue],
+    def _encode_positioned_into_pdu(self, physical_value: ParameterValue | None,
                                     encode_state: EncodeState) -> None:
         raise NotImplementedError("Encoding a TableEntryParameter is not implemented yet.")
 

odxtools/parameters/tablekeyparameter.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, Optional
 from xml.etree import ElementTree
 
 from typing_extensions import final, override
@@ -26,18 +26,18 @@ class TableKeyParameter(Parameter):
 
     # the spec mandates that exactly one of the two attributes must
     # be non-None
-    table_ref: Optional[OdxLinkRef]
-    table_snref: Optional[str]
+    table_ref: OdxLinkRef | None
+    table_snref: str | None
 
     # the spec mandates that exactly one of the two attributes must
     # be non-None
-    table_row_ref: Optional[OdxLinkRef]
-    table_row_snref: Optional[str]
+    table_row_ref: OdxLinkRef | None
+    table_row_snref: str | None
 
     @staticmethod
     @override
     def from_et(et_element: ElementTree.Element,
-                doc_frags: List[OdxDocFragment]) -> "TableKeyParameter":
+                doc_frags: list[OdxDocFragment]) -> "TableKeyParameter":
         kwargs = dataclass_fields_asdict(Parameter.from_et(et_element, doc_frags))
 
         odx_id = odxrequire(OdxLinkId.from_et(et_element, doc_frags))
@@ -62,7 +62,7 @@ class TableKeyParameter(Parameter):
 
     def __post_init__(self) -> None:
         self._table: Table
-        self._table_row: Optional[TableRow] = None
+        self._table_row: TableRow | None = None
 
     @property
     @override
@@ -70,7 +70,7 @@ class TableKeyParameter(Parameter):
         return "TABLE-KEY"
 
     @override
-    def _build_odxlinks(self) -> Dict[OdxLinkId, Any]:
+    def _build_odxlinks(self) -> dict[OdxLinkId, Any]:
         result = super()._build_odxlinks()
 
         result[self.odx_id] = self
@@ -143,7 +143,7 @@ class TableKeyParameter(Parameter):
 
     @override
     @final
-    def _encode_positioned_into_pdu(self, physical_value: Optional[ParameterValue],
+    def _encode_positioned_into_pdu(self, physical_value: ParameterValue | None,
                                     encode_state: EncodeState) -> None:
         # if you get this exception, you ought to use
         # `.encode_placeholder_into_pdu()` followed by (after the
@@ -151,7 +151,7 @@ class TableKeyParameter(Parameter):
         # `.encode_value_into_pdu()`.
         raise RuntimeError("_encode_positioned_into_pdu() cannot be called for table keys.")
 
-    def encode_placeholder_into_pdu(self, physical_value: Optional[ParameterValue],
+    def encode_placeholder_into_pdu(self, physical_value: ParameterValue | None,
                                     encode_state: EncodeState) -> None:
 
         if physical_value is not None:

odxtools/parameters/tablestructparameter.py

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: MIT
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any, Dict, List, Optional, cast
+from typing import TYPE_CHECKING, Any, cast
 from xml.etree import ElementTree
 
 from typing_extensions import override
@@ -21,8 +21,8 @@ if TYPE_CHECKING:
 
 @dataclass
 class TableStructParameter(Parameter):
-    table_key_ref: Optional[OdxLinkRef]
-    table_key_snref: Optional[str]
+    table_key_ref: OdxLinkRef | None
+    table_key_snref: str | None
 
     @property
     @override
@@ -50,7 +50,7 @@ class TableStructParameter(Parameter):
     @staticmethod
     @override
     def from_et(et_element: ElementTree.Element,
-                doc_frags: List[OdxDocFragment]) -> "TableStructParameter":
+                doc_frags: list[OdxDocFragment]) -> "TableStructParameter":
 
         kwargs = dataclass_fields_asdict(Parameter.from_et(et_element, doc_frags))
 
@@ -67,7 +67,7 @@ class TableStructParameter(Parameter):
             odxraise("Either table_key_ref or table_key_snref must be defined.")
 
     @override
-    def _build_odxlinks(self) -> Dict[OdxLinkId, Any]:
+    def _build_odxlinks(self) -> dict[OdxLinkId, Any]:
         return super()._build_odxlinks()
 
     @override
@@ -86,10 +86,10 @@ class TableStructParameter(Parameter):
                                             TableKeyParameter)
 
     @override
-    def _encode_positioned_into_pdu(self, physical_value: Optional[ParameterValue],
+    def _encode_positioned_into_pdu(self, physical_value: ParameterValue | None,
                                     encode_state: EncodeState) -> None:
 
-        if not isinstance(physical_value, (tuple, list)) or \
+        if not isinstance(physical_value, tuple|list) or \
            len(physical_value) != 2 or \
            not isinstance(physical_value[0], str):
             odxraise(

odxtools/parameters/valueparameter.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 typing_extensions import override
@@ -18,7 +18,7 @@ from .parameterwithdop import ParameterWithDOP
 
 @dataclass
 class ValueParameter(ParameterWithDOP):
-    physical_default_value_raw: Optional[str]
+    physical_default_value_raw: str | None
 
     @property
     @override
@@ -26,7 +26,7 @@ class ValueParameter(ParameterWithDOP):
         return "VALUE"
 
     @property
-    def physical_default_value(self) -> Optional[AtomicOdxType]:
+    def physical_default_value(self) -> AtomicOdxType | None:
         return self._physical_default_value
 
     @property
@@ -42,7 +42,7 @@ class ValueParameter(ParameterWithDOP):
     @staticmethod
     @override
     def from_et(et_element: ElementTree.Element,
-                doc_frags: List[OdxDocFragment]) -> "ValueParameter":
+                doc_frags: list[OdxDocFragment]) -> "ValueParameter":
 
         kwargs = dataclass_fields_asdict(ParameterWithDOP.from_et(et_element, doc_frags))
 
@@ -51,10 +51,10 @@ class ValueParameter(ParameterWithDOP):
         return ValueParameter(physical_default_value_raw=physical_default_value_raw, **kwargs)
 
     def __post_init__(self) -> None:
-        self._physical_default_value: Optional[AtomicOdxType] = None
+        self._physical_default_value: AtomicOdxType | None = None
 
     @override
-    def _build_odxlinks(self) -> Dict[OdxLinkId, Any]:
+    def _build_odxlinks(self) -> dict[OdxLinkId, Any]:
         return super()._build_odxlinks()
 
     @override
@@ -75,7 +75,7 @@ class ValueParameter(ParameterWithDOP):
                 self.physical_default_value_raw)
 
     @override
-    def _encode_positioned_into_pdu(self, physical_value: Optional[ParameterValue],
+    def _encode_positioned_into_pdu(self, physical_value: ParameterValue | None,
                                     encode_state: EncodeState) -> None:
 
         if physical_value is None:

odxtools/paramlengthinfotype.py

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: MIT
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any, Dict, List, cast
+from typing import TYPE_CHECKING, Any, cast
 from xml.etree import ElementTree
 
 from typing_extensions import override
@@ -33,7 +33,7 @@ class ParamLengthInfoType(DiagCodedType):
     @staticmethod
     @override
     def from_et(et_element: ElementTree.Element,
-                doc_frags: List[OdxDocFragment]) -> "ParamLengthInfoType":
+                doc_frags: list[OdxDocFragment]) -> "ParamLengthInfoType":
         kwargs = dataclass_fields_asdict(DiagCodedType.from_et(et_element, doc_frags))
 
         length_key_ref = odxrequire(
@@ -41,7 +41,7 @@ class ParamLengthInfoType(DiagCodedType):
 
         return ParamLengthInfoType(length_key_ref=length_key_ref, **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:
@@ -74,6 +74,8 @@ class ParamLengthInfoType(DiagCodedType):
             elif self.base_data_type in [DataType.A_UNICODE2STRING]:
                 bit_length = 16 * len(cast(str, internal_value))
             elif self.base_data_type in [DataType.A_INT32, DataType.A_UINT32]:
+                if not isinstance(internal_value, int):
+                    odxraise()
                 bit_length = int(internal_value).bit_length()
                 if self.base_data_type == DataType.A_INT32:
                     bit_length += 1

odxtools/parentref.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
+from typing import TYPE_CHECKING, Any
 from xml.etree import ElementTree
 
 from .exceptions import odxrequire
@@ -16,18 +16,18 @@ if TYPE_CHECKING:
 @dataclass
 class ParentRef:
     layer_ref: OdxLinkRef
-    not_inherited_diag_comms: List[str]  # short_name references
-    not_inherited_variables: List[str]  # short_name references
-    not_inherited_dops: List[str]  # short_name references
-    not_inherited_tables: List[str]  # short_name references
-    not_inherited_global_neg_responses: List[str]  # short_name references
+    not_inherited_diag_comms: list[str]  # short_name references
+    not_inherited_variables: list[str]  # short_name references
+    not_inherited_dops: list[str]  # short_name references
+    not_inherited_tables: list[str]  # short_name references
+    not_inherited_global_neg_responses: list[str]  # short_name references
 
     @property
     def layer(self) -> "DiagLayer":
         return self._layer
 
     @staticmethod
-    def from_et(et_element: ElementTree.Element, doc_frags: List[OdxDocFragment]) -> "ParentRef":
+    def from_et(et_element: ElementTree.Element, doc_frags: list[OdxDocFragment]) -> "ParentRef":
 
         layer_ref = odxrequire(OdxLinkRef.from_et(et_element, doc_frags))
 
@@ -69,7 +69,7 @@ class ParentRef:
             not_inherited_global_neg_responses=not_inherited_global_neg_responses,
         )
 
-    def _build_odxlinks(self) -> Dict[OdxLinkId, Any]:
+    def _build_odxlinks(self) -> dict[OdxLinkId, Any]:
         return {}
 
     def _resolve_odxlinks(self, odxlinks: OdxLinkDatabase) -> None:
@@ -81,7 +81,7 @@ class ParentRef:
     def _resolve_snrefs(self, context: SnRefContext) -> None:
         pass
 
-    def __deepcopy__(self, memo: Dict[int, Any]) -> Any:
+    def __deepcopy__(self, memo: dict[int, Any]) -> Any:
         cls = self.__class__
         result = cls.__new__(cls)
         memo[id(self)] = result

odxtools/physicaldimension.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 .element import IdentifiableElement
@@ -41,20 +41,20 @@ class PhysicalDimension(IdentifiableElement):
     )
     ```
     """
-    length_exp: Optional[int]
-    mass_exp: Optional[int]
-    time_exp: Optional[int]
-    current_exp: Optional[int]
-    temperature_exp: Optional[int]
-    molar_amount_exp: Optional[int]
-    luminous_intensity_exp: Optional[int]
+    length_exp: int | None
+    mass_exp: int | None
+    time_exp: int | None
+    current_exp: int | None
+    temperature_exp: int | None
+    molar_amount_exp: int | None
+    luminous_intensity_exp: int | None
 
     @staticmethod
     def from_et(et_element: ElementTree.Element,
-                doc_frags: List[OdxDocFragment]) -> "PhysicalDimension":
+                doc_frags: list[OdxDocFragment]) -> "PhysicalDimension":
         kwargs = dataclass_fields_asdict(IdentifiableElement.from_et(et_element, doc_frags))
 
-        def read_optional_int(element: ElementTree.Element, name: str) -> Optional[int]:
+        def read_optional_int(element: ElementTree.Element, name: str) -> int | None:
             if (val_str := element.findtext(name)) is not None:
                 return int(val_str)
             else:
@@ -78,7 +78,7 @@ class PhysicalDimension(IdentifiableElement):
             luminous_intensity_exp=luminous_intensity_exp,
             **kwargs)
 
-    def _build_odxlinks(self) -> Dict[OdxLinkId, Any]:
+    def _build_odxlinks(self) -> dict[OdxLinkId, Any]:
         return {self.odx_id: self}
 
     def _resolve_odxlinks(self, odxlinks: OdxLinkDatabase) -> None: