Correct minor framer/pdu errors.

pymodbus-dev · Oct 23, 2024 · 686f4fb · 686f4fb
1 parent 31528c1
commit 686f4fb
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/pymodbus/framer/base.py b/pymodbus/framer/base.py
@@ -34,7 +34,6 @@ def __init__(
     ) -> None:
         """Initialize a ADU (framer) instance."""
         self.decoder = decoder
-        self.databuffer = b""
 
     def decode(self, _data: bytes) -> tuple[int, int, int, bytes]:
         """Decode ADU.

diff --git a/pymodbus/transaction.py b/pymodbus/transaction.py
@@ -192,10 +192,10 @@ def execute(self, no_response_expected: bool, request: ModbusPDU):  # noqa: C901
                     request.transaction_id = 0
                 Log.debug("Running transaction {}", request.transaction_id)
                 if _buffer := hexlify_packets(
-                    self.client.framer.databuffer
+                    self.databuffer
                 ):
                     Log.debug("Clearing current Frame: - {}", _buffer)
-                    self.client.framer.databuffer = b''
+                    self.databuffer = b''
                 expected_response_length = None
                 if not isinstance(self.client.framer, FramerSocket):
                     response_pdu_size = request.get_response_pdu_size()

diff --git a/test/framer/test_framer.py b/test/framer/test_framer.py
@@ -415,7 +415,6 @@ def test_processIncomingFrame_roundtrip(self, entry, test_framer, msg, dev_id, t
         assert result
         assert result.slave_id == dev_id
         assert result.transaction_id == tid
-        assert not test_framer.databuffer
         expected = test_framer.encode(
             result.function_code.to_bytes(1,'big') + result.encode(),
             dev_id, 1)