Extend TransactionManager to handle sync. (#2457)

Author: janiversen

pymodbus/client/base.py

@@ -11,7 +11,7 @@
 from pymodbus.framer import FRAMER_NAME_TO_CLASS, FramerBase, FramerType
 from pymodbus.logging import Log
 from pymodbus.pdu import DecodePDU, ModbusPDU
-from pymodbus.transaction import SyncModbusTransactionManager
+from pymodbus.transaction import TransactionManager
 from pymodbus.transport import CommParams
 from pymodbus.utilities import ModbusTransactionState
 
@@ -27,15 +27,14 @@ def __init__(
         framer: FramerType,
         retries: int,
         on_connect_callback: Callable[[bool], None] | None,
-        comm_params: CommParams | None = None,
+        comm_params: CommParams,
     ) -> None:
         """Initialize a client instance.
 
         :meta private:
         """
         ModbusClientMixin.__init__(self)  # type: ignore[arg-type]
-        if comm_params:
-            self.comm_params = comm_params
+        self.comm_params = comm_params
         self.ctx = ModbusClientProtocol(
             (FRAMER_NAME_TO_CLASS[framer])(DecodePDU(False)),
             self.comm_params,
@@ -116,23 +115,25 @@ def __init__(
         self,
         framer: FramerType,
         retries: int,
-        comm_params: CommParams | None = None,
+        comm_params: CommParams,
     ) -> None:
         """Initialize a client instance.
 
         :meta private:
         """
         ModbusClientMixin.__init__(self)  # type: ignore[arg-type]
-        if comm_params:
-            self.comm_params = comm_params
+        self.comm_params = comm_params
         self.retries = retries
         self.slaves: list[int] = []
 
         # Common variables.
         self.framer: FramerBase = (FRAMER_NAME_TO_CLASS[framer])(DecodePDU(False))
-        self.transaction = SyncModbusTransactionManager(
+        self.transaction = TransactionManager(
+            self.comm_params,
+            self.framer,
+            retries,
+            False,
             self,
-            self.retries,
         )
         self.reconnect_delay_current = self.comm_params.reconnect_delay or 0
         self.use_udp = False
@@ -177,7 +178,7 @@ def execute(self, no_response_expected: bool, request: ModbusPDU) -> ModbusPDU:
         """
         if not self.connect():
             raise ConnectionException(f"Failed to connect[{self!s}]")
-        return self.transaction.execute(no_response_expected, request)
+        return self.transaction.sync_execute(no_response_expected, request)
 
     # ----------------------------------------------------------------------- #
     # Internal methods

pymodbus/client/serial.py

@@ -103,6 +103,7 @@ def __init__(  # pylint: disable=too-many-arguments
             framer,
             retries,
             on_connect_callback,
+            self.comm_params,
         )
 
 
@@ -185,6 +186,7 @@ def __init__(  # pylint: disable=too-many-arguments
         super().__init__(
             framer,
             retries,
+            self.comm_params,
         )
         if "serial" not in sys.modules:
             raise RuntimeError(

pymodbus/client/tcp.py

@@ -84,6 +84,7 @@ def __init__(  # pylint: disable=too-many-arguments
             framer,
             retries,
             on_connect_callback,
+            self.comm_params,
         )
 
 
@@ -154,7 +155,7 @@ def __init__(
                 reconnect_delay_max=reconnect_delay_max,
                 timeout_connect=timeout,
             )
-        super().__init__(framer, retries)
+        super().__init__(framer, retries, self.comm_params)
         self.socket = None
 
     @property

pymodbus/client/udp.py

@@ -85,6 +85,7 @@ def __init__(  # pylint: disable=too-many-arguments
             framer,
             retries,
             on_connect_callback,
+            self.comm_params,
         )
         self.source_address = source_address
 
@@ -155,7 +156,7 @@ def __init__(
             reconnect_delay_max=reconnect_delay_max,
             timeout_connect=timeout,
         )
-        super().__init__(framer, retries)
+        super().__init__(framer, retries, self.comm_params)
         self.socket = None
 
     @property

pymodbus/transaction/__init__.py

@@ -1,12 +1,6 @@
 """Transaction."""
 __all__ = [
-    "ModbusTransactionManager",
-    "SyncModbusTransactionManager",
     "TransactionManager",
 ]
 
-from pymodbus.transaction.old_transaction import (
-    ModbusTransactionManager,
-    SyncModbusTransactionManager,
-)
 from pymodbus.transaction.transaction import TransactionManager