DiagCodedType: rename _extract_internal_value() to `_extract_atomic…

…_value()` Signed-off-by: Andreas Lauser <[email protected]> Signed-off-by: Florian Jost <[email protected]>
mercedes-benz · Feb 15, 2024 · 59324c3 · 59324c3
1 parent d643820
commit 59324c3
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/odxtools/diagcodedtype.py b/odxtools/diagcodedtype.py
@@ -70,7 +70,7 @@ def is_highlow_byte_order(self) -> bool:
         return self.is_highlow_byte_order_raw in [None, True]
 
     @staticmethod
-    def _extract_internal_value(
+    def _extract_atomic_value(
         coded_message: bytes,
         byte_position: int,
         bit_position: int,

diff --git a/odxtools/leadinglengthinfotype.py b/odxtools/leadinglengthinfotype.py
@@ -69,7 +69,7 @@ def decode_from_pdu(self, decode_state: DecodeState) -> AtomicOdxType:
         coded_message = decode_state.coded_message
 
         # Extract length of the parameter value
-        byte_length, byte_position = self._extract_internal_value(
+        byte_length, byte_position = self._extract_atomic_value(
             coded_message=coded_message,
             byte_position=decode_state.cursor_byte_position,
             bit_position=decode_state.cursor_bit_position,
@@ -85,7 +85,7 @@ def decode_from_pdu(self, decode_state: DecodeState) -> AtomicOdxType:
         # Extract actual value
         # TODO: The returned value is None if the byte_length is 0. Maybe change it
         #       to some default value like an empty bytearray() or 0?
-        value, cursor_byte_position = self._extract_internal_value(
+        value, cursor_byte_position = self._extract_atomic_value(
             coded_message=coded_message,
             byte_position=byte_position,
             bit_position=0,

diff --git a/odxtools/minmaxlengthtype.py b/odxtools/minmaxlengthtype.py
@@ -145,7 +145,7 @@ def decode_from_pdu(self, decode_state: DecodeState) -> AtomicOdxType:
                     terminator_pos += 1
 
             # Extract the value
-            value, byte_pos = self._extract_internal_value(
+            value, byte_pos = self._extract_atomic_value(
                 decode_state.coded_message,
                 byte_position=cursor_pos,
                 bit_position=0,
@@ -167,7 +167,7 @@ def decode_from_pdu(self, decode_state: DecodeState) -> AtomicOdxType:
             # or at the end of the PDU.
             byte_length = max_terminator_pos - cursor_pos
 
-            value, byte_pos = self._extract_internal_value(
+            value, byte_pos = self._extract_atomic_value(
                 decode_state.coded_message,
                 byte_position=cursor_pos,
                 bit_position=0,

diff --git a/odxtools/parameters/matchingrequestparameter.py b/odxtools/parameters/matchingrequestparameter.py
@@ -43,7 +43,7 @@ def decode_from_pdu(self, decode_state: DecodeState) -> ParameterValue:
         if self.byte_position is not None:
             decode_state.cursor_byte_position = decode_state.origin_byte_position + self.byte_position
 
-        result, decode_state.cursor_byte_position = DiagCodedType._extract_internal_value(
+        result, decode_state.cursor_byte_position = DiagCodedType._extract_atomic_value(
             coded_message=decode_state.coded_message,
             byte_position=decode_state.cursor_byte_position,
             bit_position=self.bit_position or 0,

diff --git a/odxtools/paramlengthinfotype.py b/odxtools/paramlengthinfotype.py
@@ -88,7 +88,7 @@ def decode_from_pdu(self, decode_state: DecodeState) -> AtomicOdxType:
             bit_length = 0
 
         # Extract the internal value and return.
-        value, cursor_byte_position = self._extract_internal_value(
+        value, cursor_byte_position = self._extract_atomic_value(
             decode_state.coded_message,
             decode_state.cursor_byte_position,
             decode_state.cursor_bit_position,

diff --git a/odxtools/standardlengthtype.py b/odxtools/standardlengthtype.py
@@ -57,7 +57,7 @@ def convert_internal_to_bytes(self, internal_value: AtomicOdxType, encode_state:
         )
 
     def decode_from_pdu(self, decode_state: DecodeState) -> AtomicOdxType:
-        internal_value, cursor_byte_position = self._extract_internal_value(
+        internal_value, cursor_byte_position = self._extract_atomic_value(
             decode_state.coded_message,
             decode_state.cursor_byte_position,
             decode_state.cursor_bit_position,