Merge pull request #397 from andlaus/small_fixes

Small fixes

Author: andlaus

.github/workflows/tests.yml

@@ -20,7 +20,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.12"
+          python-version: "3"
 
       - name: Setup up YaPF formatting linter
         run: |
@@ -38,7 +38,7 @@ jobs:
       matrix:
         # restrict the matrix to the oldest and the latest Python
         # version being supported by odxtools
-        python-version: ["3.8", "3.12"]
+        python-version: ["3.8", "3"]
 
     steps:
       - uses: actions/checkout@v3
@@ -73,7 +73,7 @@ jobs:
         os: [ubuntu-latest, windows-latest]
         # restrict the matrix to the oldest and the latest Python
         # version being supported by odxtools
-        python-version: ["3.8", "3.12"]
+        python-version: ["3.8", "3"]
 
         # due to the slow windows runners, we refrain from testing every python
         # version on windows-latest

odxtools/dataobjectproperty.py

@@ -13,11 +13,11 @@
 from .exceptions import EncodeError, odxraise, odxrequire
 from .internalconstr import InternalConstr
 from .odxlink import OdxDocFragment, OdxLinkDatabase, OdxLinkId, OdxLinkRef
-from .odxtypes import AtomicOdxType, ParameterValue
+from .odxtypes import AtomicOdxType, BytesTypes, ParameterValue
 from .physicaltype import PhysicalType
 from .snrefcontext import SnRefContext
 from .unit import Unit
-from .utils import BytesTypes, dataclass_fields_asdict
+from .utils import dataclass_fields_asdict
 
 
 @dataclass

odxtools/encodestate.py

@@ -5,8 +5,7 @@
 
 from .encoding import Encoding, get_string_encoding
 from .exceptions import EncodeError, OdxWarning, odxassert, odxraise
-from .odxtypes import AtomicOdxType, DataType, ParameterValue
-from .utils import BytesTypes
+from .odxtypes import AtomicOdxType, BytesTypes, DataType, ParameterValue
 
 try:
     import bitstruct.c as bitstruct

odxtools/matchingparameter.py

@@ -8,9 +8,8 @@
 from .diagservice import DiagService
 from .exceptions import odxraise, odxrequire
 from .odxlink import OdxDocFragment, OdxLinkDatabase, OdxLinkId, resolve_snref
-from .odxtypes import ParameterValue, ParameterValueDict
+from .odxtypes import BytesTypes, ParameterValue, ParameterValueDict
 from .snrefcontext import SnRefContext
-from .utils import BytesTypes
 
 
 @dataclass

odxtools/minmaxlengthtype.py

@@ -10,10 +10,10 @@
 from .diagcodedtype import DctType, DiagCodedType
 from .encodestate import EncodeState
 from .encoding import get_string_encoding
-from .exceptions import (DecodeError, EncodeError, odxassert, odxraise, odxrequire)
+from .exceptions import DecodeError, EncodeError, odxassert, odxraise, odxrequire
 from .odxlink import OdxDocFragment
-from .odxtypes import AtomicOdxType, DataType
-from .utils import BytesTypes, dataclass_fields_asdict
+from .odxtypes import AtomicOdxType, BytesTypes, DataType
+from .utils import dataclass_fields_asdict
 
 
 class Termination(Enum):

odxtools/odxtypes.py

@@ -1,11 +1,10 @@
 # SPDX-License-Identifier: MIT
 from enum import Enum
-from typing import (TYPE_CHECKING, Any, Callable, Dict, Iterable, Optional, Tuple, Type, Union,
-                    overload)
+from typing import (TYPE_CHECKING, Any, Callable, Dict, Iterable, Optional, SupportsBytes, Tuple,
+                    Type, Union, overload)
 from xml.etree import ElementTree
 
 from .exceptions import odxassert, odxraise, odxrequire
-from .utils import BytesTypes
 
 if TYPE_CHECKING:
     from odxtools.diagnostictroublecode import DiagnosticTroubleCode
@@ -17,7 +16,8 @@ def bytefield_to_bytearray(bytefield: str) -> bytearray:
     return bytearray([int(x, 16) for x in bytes_string])
 
 
-AtomicOdxType = Union[str, int, float, bytes]
+BytesTypes = (bytearray, bytes, SupportsBytes)
+AtomicOdxType = Union[str, int, float, bytearray, bytes]
 
 # dictionary mapping short names to a Parameter that needs to be
 # specified. Complex parameters (structures) may contain

odxtools/parameters/tablestructparameter.py

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: MIT
 from dataclasses import dataclass
-from typing import Any, Dict, List, Optional, cast
+from typing import TYPE_CHECKING, Any, Dict, List, Optional, cast
 from xml.etree import ElementTree
 
 from typing_extensions import override
@@ -15,6 +15,9 @@
 from .parameter import Parameter, ParameterType
 from .tablekeyparameter import TableKeyParameter
 
+if TYPE_CHECKING:
+    from ..table import Table
+
 
 @dataclass
 class TableStructParameter(Parameter):
@@ -69,6 +72,10 @@ def _resolve_snrefs(self, context: SnRefContext) -> None:
     def table_key(self) -> TableKeyParameter:
         return self._table_key
 
+    @property
+    def table(self) -> "Table":
+        return self._table_key.table
+
     @property
     @override
     def is_required(self) -> bool:

odxtools/standardlengthtype.py

@@ -10,8 +10,8 @@
 from .encodestate import EncodeState
 from .exceptions import odxassert, odxraise, odxrequire
 from .odxlink import OdxDocFragment
-from .odxtypes import AtomicOdxType, DataType, odxstr_to_bool
-from .utils import BytesTypes, dataclass_fields_asdict
+from .odxtypes import AtomicOdxType, BytesTypes, DataType, odxstr_to_bool
+from .utils import dataclass_fields_asdict
 
 
 @dataclass

odxtools/utils.py

@@ -3,15 +3,11 @@
 import re
 from typing import TYPE_CHECKING, Any, Dict, Optional
 
-from typing_extensions import SupportsBytes
-
 if TYPE_CHECKING:
     from .database import Database
     from .diaglayers.diaglayer import DiagLayer
     from .snrefcontext import SnRefContext
 
-BytesTypes = (bytearray, bytes, SupportsBytes)
-
 
 def retarget_snrefs(database: "Database",
                     diag_layer: "DiagLayer",