Merge pull request #197 from andlaus/minor_fixes

mercedes-benz · Sep 5, 2023 · ca4a522 · ca4a522
2 parents d58a298 + c28a4d6
commit ca4a522
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 9 deletions.
diff --git a/odxtools/dtcdop.py b/odxtools/dtcdop.py
@@ -90,6 +90,7 @@ def _resolve_odxlinks(self, odxlinks: OdxLinkDatabase):
         self._dtcs = NamedItemList[DiagnosticTroubleCode]()
         for dtc_proxy in self.dtcs_raw:
             if isinstance(dtc_proxy, DiagnosticTroubleCode):
+                dtc_proxy._resolve_odxlinks(odxlinks)
                 self._dtcs.append(dtc_proxy)
             elif isinstance(dtc_proxy, OdxLinkRef):
                 dtc = odxlinks.resolve(dtc_proxy, DiagnosticTroubleCode)

diff --git a/odxtools/inputparam.py b/odxtools/inputparam.py
@@ -3,6 +3,8 @@
 from typing import TYPE_CHECKING, Any, Dict, List, Optional
 from xml.etree import ElementTree
 
+from deprecation import deprecated
+
 from .dopbase import DopBase
 from .element import NamedElement
 from .exceptions import odxrequire
@@ -40,12 +42,17 @@ def _build_odxlinks(self) -> Dict[OdxLinkId, Any]:
         return {}
 
     def _resolve_odxlinks(self, odxlinks: OdxLinkDatabase) -> None:
-        self._dop = odxlinks.resolve(self.dop_base_ref, DopBase)
+        self._dop_base = odxlinks.resolve(self.dop_base_ref, DopBase)
 
     def _resolve_snrefs(self, diag_layer: "DiagLayer") -> None:
         pass
 
     @property
-    def dop(self) -> DopBase:
+    def dop_base(self) -> DopBase:
         """The data object property describing this parameter."""
-        return self._dop
+        return self._dop_base
+
+    @property
+    @deprecated(details="use .dop_base")
+    def dop(self) -> DopBase:
+        return self._dop_base
diff --git a/odxtools/outputparam.py b/odxtools/outputparam.py
@@ -3,6 +3,8 @@
 from typing import TYPE_CHECKING, Any, Dict, List, Optional
 from xml.etree import ElementTree
 
+from deprecation import deprecated
+
 from .dopbase import DopBase
 from .element import IdentifiableElement
 from .exceptions import odxrequire
@@ -19,9 +21,6 @@ class OutputParam(IdentifiableElement):
     oid: Optional[str]
     semantic: Optional[str]
 
-    def __post_init__(self) -> None:
-        self._dop: Optional[DopBase] = None
-
     @staticmethod
     def from_et(et_element: ElementTree.Element, doc_frags: List[OdxDocFragment]) -> "OutputParam":
 
@@ -36,12 +35,17 @@ def _build_odxlinks(self) -> Dict[OdxLinkId, Any]:
         return {}
 
     def _resolve_odxlinks(self, odxlinks: OdxLinkDatabase) -> None:
-        self._dop = odxlinks.resolve(self.dop_base_ref)
+        self._dop_base = odxlinks.resolve(self.dop_base_ref)
 
     def _resolve_snrefs(self, diag_layer: "DiagLayer") -> None:
         pass
 
     @property
-    def dop(self) -> Optional[DopBase]:
+    def dop_base(self) -> DopBase:
         """The data object property describing this parameter."""
-        return self._dop
+        return self._dop_base
+
+    @property
+    @deprecated(details="use .dop_base")
+    def dop(self) -> DopBase:
+        return self._dop_base
diff --git a/odxtools/parameters/parameterwithdop.py b/odxtools/parameters/parameterwithdop.py
@@ -25,6 +25,7 @@ class ParameterWithDOP(Parameter):
     def __post_init__(self) -> None:
         odxassert(self.dop_snref is not None or self.dop_ref is not None,
                   f"Param {self.short_name} without a DOP-(SN)REF should not exist!")
+        self._dop: Optional[DopBase] = None
 
     def _build_odxlinks(self) -> Dict[OdxLinkId, Any]:
         return super()._build_odxlinks()