Do not initialize framer twice. (#1153)

Author: janiversen

pymodbus/client/base.py

@@ -119,7 +119,10 @@ def __init__(
         self.params.kwargs = kwargs
 
         # Common variables.
-        self.framer = self.params.framer(ClientDecoder(), self)
+        if xframer := kwargs.get("xframer", None):
+            self.framer = xframer
+        else:
+            self.framer = self.params.framer(ClientDecoder(), self)
         self.transaction = DictTransactionManager(self, **kwargs)
         self.delay_ms = self.params.reconnect_delay
         self.use_protocol = hasattr(self, "protocol")

pymodbus/client/serial.py

@@ -81,7 +81,7 @@ async def close(self):  # pylint: disable=invalid-overridden-method
 
     def _create_protocol(self):
         """Create protocol."""
-        protocol = ModbusClientProtocol(framer=self.params.framer)
+        protocol = ModbusClientProtocol(framer=self.params.framer, xframer=self.framer)
         protocol.factory = self
         return protocol
 

pymodbus/client/tcp.py

@@ -75,7 +75,9 @@ async def close(self):  # pylint: disable=invalid-overridden-method
 
     def _create_protocol(self):
         """Create initialized protocol instance with factory function."""
-        protocol = ModbusClientProtocol(framer=self.params.framer, **self.params.kwargs)
+        protocol = ModbusClientProtocol(
+            framer=self.params.framer, xframer=self.framer, **self.params.kwargs
+        )
         protocol.factory = self
         return protocol
 

pymodbus/client/udp.py

@@ -96,7 +96,10 @@ async def close(self):  # pylint: disable=invalid-overridden-method
     def _create_protocol(self, host=None, port=0):
         """Create initialized protocol instance with factory function."""
         protocol = ModbusClientProtocol(
-            use_udp=True, framer=self.params.framer, **self.params.kwargs
+            use_udp=True,
+            framer=self.params.framer,
+            xframer=self.framer,
+            **self.params.kwargs,
         )
         protocol.params.host = host
         protocol.params.port = port