Parameter "strict" is and was only used for serial server/client. (#1975)

Author: janiversen

examples/client_async.py

@@ -85,6 +85,7 @@ def setup_async_client(description=None, cmdline=None):
             #    parity="N",
             #    stopbits=1,
             #    handle_local_echo=False,
+            #    strict=True,
         )
     elif args.comm == "tls":
         client = modbusClient.AsyncModbusTlsClient(
@@ -95,7 +96,6 @@ def setup_async_client(description=None, cmdline=None):
             timeout=args.timeout,
             #    retries=3,
             #    retry_on_empty=False,
-            #    strict=True,
             # TLS setup parameters
             #    sslctx=sslctx,
             certfile=helper.get_certificate("crt"),

examples/client_sync.py

@@ -91,6 +91,7 @@ def setup_sync_client(description=None, cmdline=None):
             #    parity="N",
             #    stopbits=1,
             #    handle_local_echo=False,
+            #    strict=True,
         )
     elif args.comm == "tls":
         client = modbusClient.ModbusTlsClient(
@@ -101,7 +102,6 @@ def setup_sync_client(description=None, cmdline=None):
             timeout=args.timeout,
             #    retries=3,
             #    retry_on_empty=False,
-            #    strict=True,
             # TLS setup parameters
             #    sslctx=None,
             certfile=helper.get_certificate("crt"),

examples/server_async.py

@@ -158,7 +158,6 @@ async def run_async_server(args):
             # ignore_missing_slaves=True,  # ignore request to a missing slave
             # broadcast_enable=False,  # treat slave_id 0 as broadcast address,
             # timeout=1,  # waiting time for request to complete
-            # TBD strict=True,  # use strict timing, t1.5 for Modbus RTU
         )
     elif args.comm == "udp":
         address = (
@@ -174,7 +173,6 @@ async def run_async_server(args):
             # ignore_missing_slaves=True,  # ignore request to a missing slave
             # broadcast_enable=False,  # treat slave_id 0 as broadcast address,
             # timeout=1,  # waiting time for request to complete
-            # TBD strict=True,  # use strict timing, t1.5 for Modbus RTU
         )
     elif args.comm == "serial":
         # socat -d -d PTY,link=/tmp/ptyp0,raw,echo=0,ispeed=9600
@@ -216,7 +214,6 @@ async def run_async_server(args):
             # ignore_missing_slaves=True,  # ignore request to a missing slave
             # broadcast_enable=False,  # treat slave_id 0 as broadcast address,
             # timeout=1,  # waiting time for request to complete
-            # TBD strict=True,  # use strict timing, t1.5 for Modbus RTU
         )
     return server
 

examples/server_sync.py

@@ -71,7 +71,6 @@ def run_sync_server(args):
             # ignore_missing_slaves=True,  # ignore request to a missing slave
             # broadcast_enable=False,  # treat slave_id 0 as broadcast address,
             # timeout=1,  # waiting time for request to complete
-            # TBD strict=True,  # use strict timing, t1.5 for Modbus RTU
         )
     elif args.comm == "udp":
         address = ("127.0.0.1", args.port) if args.port else None
@@ -84,7 +83,6 @@ def run_sync_server(args):
             # ignore_missing_slaves=True,  # ignore request to a missing slave
             # broadcast_enable=False,  # treat slave_id 0 as broadcast address,
             # timeout=1,  # waiting time for request to complete
-            # TBD strict=True,  # use strict timing, t1.5 for Modbus RTU
         )
     elif args.comm == "serial":
         # socat -d -d PTY,link=/tmp/ptyp0,raw,echo=0,ispeed=9600
@@ -126,7 +124,6 @@ def run_sync_server(args):
             # ignore_missing_slaves=True,  # ignore request to a missing slave
             # broadcast_enable=False,  # treat slave_id 0 as broadcast address,
             # timeout=1,  # waiting time for request to complete
-            # TBD strict=True,  # use strict timing, t1.5 for Modbus RTU
         )
     return server
 

examples/simple_async_client.py

@@ -34,7 +34,6 @@ async def run_async_simple_client(comm, host, port, framer=Framer.SOCKET):
             # timeout=10,
             # retries=3,
             # retry_on_empty=False,
-            # strict=True,
             # source_address=("localhost", 0),
         )
     elif comm == "udp":
@@ -45,7 +44,6 @@ async def run_async_simple_client(comm, host, port, framer=Framer.SOCKET):
             # timeout=10,
             # retries=3,
             # retry_on_empty=False,
-            # strict=True,
             # source_address=None,
         )
     elif comm == "serial":
@@ -70,7 +68,6 @@ async def run_async_simple_client(comm, host, port, framer=Framer.SOCKET):
             # timeout=10,
             # retries=3,
             # retry_on_empty=False,
-            # strict=True,
             # sslctx=sslctx,
             certfile="../examples/certificates/pymodbus.crt",
             keyfile="../examples/certificates/pymodbus.key",

examples/simple_sync_client.py

@@ -36,7 +36,6 @@ def run_sync_simple_client(comm, host, port, framer=Framer.SOCKET):
             # timeout=10,
             # retries=3,
             # retry_on_empty=False,y
-            # strict=True,
             # source_address=("localhost", 0),
         )
     elif comm == "udp":
@@ -47,7 +46,6 @@ def run_sync_simple_client(comm, host, port, framer=Framer.SOCKET):
             # timeout=10,
             # retries=3,
             # retry_on_empty=False,
-            # strict=True,
             # source_address=None,
         )
     elif comm == "serial":
@@ -72,7 +70,6 @@ def run_sync_simple_client(comm, host, port, framer=Framer.SOCKET):
             # timeout=10,
             # retries=3,
             # retry_on_empty=False,
-            # strict=True,
             # sslctx=None,
             certfile="../examples/certificates/pymodbus.crt",
             keyfile="../examples/certificates/pymodbus.key",

pymodbus/client/base.py

@@ -278,7 +278,6 @@ class ModbusBaseSyncClient(ModbusClientMixin, ModbusProtocol):
     :param timeout: Timeout for a request, in seconds.
     :param retries: Max number of retries per request.
     :param retry_on_empty: Retry on empty response.
-    :param strict: Strict timing, 1.5 character between requests.
     :param broadcast_enable: True to treat id 0 as broadcast address.
     :param reconnect_delay: Minimum delay in seconds.milliseconds before reconnecting.
     :param reconnect_delay_max: Maximum delay in seconds.milliseconds before reconnecting.
@@ -302,21 +301,19 @@ class _params:
 
         retries: int | None = None
         retry_on_empty: bool | None = None
-        strict: bool | None = None
         broadcast_enable: bool | None = None
         reconnect_delay: int | None = None
 
         source_address: tuple[str, int] | None = None
 
         server_hostname: str | None = None
 
-    def __init__(  # pylint: disable=too-many-arguments
+    def __init__(
         self,
         framer: Framer,
         timeout: float = 3,
         retries: int = 3,
         retry_on_empty: bool = False,
-        strict: bool = True,
         broadcast_enable: bool = False,
         reconnect_delay: float = 0.1,
         reconnect_delay_max: float = 300.0,
@@ -350,7 +347,6 @@ def __init__(  # pylint: disable=too-many-arguments
         self.params = self._params()
         self.params.retries = int(retries)
         self.params.retry_on_empty = bool(retry_on_empty)
-        self.params.strict = bool(strict)
         self.params.broadcast_enable = bool(broadcast_enable)
         self.retry_on_empty: int = 0
         self.no_resend_on_retry = no_resend_on_retry

pymodbus/client/serial.py

@@ -161,6 +161,7 @@ def __init__(
         bytesize: int = 8,
         parity: str = "N",
         stopbits: int = 1,
+        strict: bool = True,
         **kwargs: Any,
     ) -> None:
         """Initialize Modbus Serial Client."""
@@ -175,6 +176,7 @@ def __init__(
             **kwargs,
         )
         self.socket = None
+        self.strict = bool(strict)
 
         self.last_frame_end = None
 
@@ -211,7 +213,7 @@ def connect(self):
                 parity=self.comm_params.parity,
                 exclusive=True,
             )
-            if self.params.strict:
+            if self.strict:
                 self.socket.interCharTimeout = self.inter_char_timeout
             self.last_frame_end = None
         except serial.SerialException as msg:

pymodbus/client/tcp.py

@@ -108,7 +108,6 @@ class ModbusTcpClient(ModbusBaseSyncClient):
     :param timeout: Timeout for a request, in seconds.
     :param retries: Max number of retries per request.
     :param retry_on_empty: Retry on empty response.
-    :param strict: Strict timing, 1.5 character between requests.
     :param broadcast_enable: True to treat id 0 as broadcast address.
     :param reconnect_delay: Minimum delay in seconds.milliseconds before reconnecting.
     :param reconnect_delay_max: Maximum delay in seconds.milliseconds before reconnecting.

pymodbus/client/tls.py

@@ -116,7 +116,6 @@ class ModbusTlsClient(ModbusTcpClient):
     :param timeout: Timeout for a request, in seconds.
     :param retries: Max number of retries per request.
     :param retry_on_empty: Retry on empty response.
-    :param strict: Strict timing, 1.5 character between requests.
     :param broadcast_enable: True to treat id 0 as broadcast address.
     :param reconnect_delay: Minimum delay in seconds.milliseconds before reconnecting.
     :param reconnect_delay_max: Maximum delay in seconds.milliseconds before reconnecting.