pyModbusTCP 0.4.0a1__tar.gz → 0.4.0a2__tar.gz

pymodbustcp-0.4.0a2/.gitignore

@@ -0,0 +1,26 @@
+# Also read by hatchling (the build backend): these files never go in the sdist or the wheel.
+
+# bytecode
+__pycache__/
+*.py[cod]
+
+# build outputs
+build/
+dist/
+*.egg-info/
+
+# virtual environments
+/venv/
+/.venv/
+
+# editors and OS
+/.idea/
+/.vscode/
+.DS_Store
+
+# local experiments
+/lab/
+
+# Sphinx documentation (built pages and generated help of the tools)
+/docs/_build/
+/docs/_generated/

{pymodbustcp-0.4.0a1 → pymodbustcp-0.4.0a2}/CHANGES

@@ -1,11 +1,76 @@
 Revision history for pyModbusTCP
 
-0.4.0a1 xxxx-xx-xx (alpha: the command line tools, their options and output, may still change before 0.4.0)
+0.4.0a2 2026-10-17 (alpha: the command line tools, their options and output, may still change before 0.4.0)
+
+    Changes since 0.4.0a1 (see 0.4.0a1 below for the changes since 0.3.1).
+
+    Breaking changes:
+
+    - extras: "pyModbusTCP[tools]" is renamed "pyModbusTCP[cli]" (the mbtcp-* commands of pyModbusTCP-cli).
+    - ModbusServer: max_connections_per_host (16) is active by default: a client host (an IPv4 address, or a /64
+                    network for IPv6) can't open more connections, the next ones are closed at once. Clients
+                    behind a NAT share the same address: raise it, or set it to None to get the previous behavior.
+    - ModbusServer: the constructor checks host (a str) and port (an int from 0 to 65535): TypeError or ValueError,
+                    a bad value was only seen by start().
+    - ModbusClient, DataBank: numpy booleans (numpy.bool_, like the items of a numpy bool array) are no longer
+                    accepted as coil values (TypeError, like NumPy 2 that refuses them as integers): convert them
+                    with bool() or tolist(). Numpy integers are still accepted.
+    - tools: mbtcp-client exits with status 130 when Ctrl-C interrupts a request (it was 0, a success). Ctrl-C is
+             still the normal end of a read repeated with -i (status 0).
+    - tools: the delays given on the command line (-t, -e, -i, --idle-timeout) must be greater than 0 and at most
+             86400 s (one day), the serial rate (-b) greater than 0, and the slave address of mbtcp-rtu2tcp (-a)
+             from 1 to 247: invalid values are refused at startup (status 2).
+
+    Security:
+
+    - fix tools: mbtcp-tcp2rtu serves the waiting requests in turn by client host (round robin), instead of one
+                 FIFO of 5 requests: 3 hosts (with 2 pending requests each) could fill it, every request of the
+                 other hosts got exception 0x0A (denial of service). A request now waits for at most one request of
+                 each other host. Up to 16 requests can wait for the serial line (the limit of 2 per host is kept).
+    - fix tools: mbtcp-tcp2rtu wrote the requests with an invalid function code (0, or 0x80 to 0xFF: the exception
+                 flag of a reply) on the serial line (out of --read-only mode): they get exception 0x01 now.
+    - fix tools: mbtcp-tcp2rtu no longer sends on the serial line a request that its client session doesn't wait for
+                 anymore (gateway timeout).
+    - fix ModbusServer: request_timeout is a limit for the whole request (MBAP header and PDU) from its first byte, as
+                        documented: the delay restarted for the PDU, a client could hold a session twice as long.
+    - fix ModbusServer: on Windows, the listening port is reserved with SO_EXCLUSIVEADDRUSE instead of SO_REUSEADDR,
+                        which allowed another local socket to bind the same port and take the connections of the
+                        server (port hijacking). No change on the other systems.
+    - improve ModbusServer: add max_connections_per_host (default 16), a single host can no longer take every
+                            connection of max_connections (denial of service).
+
+    Changes:
+
+    - tools: mbtcp-tcp2rtu limits the pending requests of a client host (at most 2, the next ones get exception
+      0x0A). Its refused requests are logged once per 10 s at most (with their count) instead of one line per
+      request. New options --max-connections and --max-connections-per-host for mbtcp-tcp2rtu,
+      --max-connections-per-host for mbtcp-server.
+    - tools: mbtcp-tcp2rtu and mbtcp-rtu2tcp stop cleanly on SIGTERM (systemd, docker stop...), like mbtcp-server.
+    - fix tools: -b 0 made mbtcp-tcp2rtu and mbtcp-rtu2tcp crash (ZeroDivisionError), a negative or "nan" timeout
+                 of mbtcp-tcp2rtu made every request fail, "-a 0" made mbtcp-rtu2tcp a silent slave, "-i inf" made
+                 mbtcp-client crash (OverflowError).
+    - fix utils: valid_host() accepted some non-ASCII chars (like the Kelvin sign "\u212a", taken for a "k" by a
+                 case-insensitive match), the resolver could then raise a UnicodeError at connect time.
+    - fix ModbusClient: a host name that the resolver can't encode (UnicodeError) is a connect error
+                        (MB_CONNECT_ERR), the request raised the exception.
+    - fix ModbusServer: start() no longer leaves the listening socket open when bind() raises something else than
+                        an OSError (like an OverflowError for a port changed to 70000 after the constructor).
+    - fix ModbusServer: a data handler that returns a value that can't be encoded in the response (like a register
+                        value out of 0-65535, or an exception code over 255) gets a SLAVE_DEVICE_FAILURE (0x04)
+                        exception, the session was closed.
+    - typing: type hints use the Python 3.10 syntax (X | None, list[int]...).
+    - build: tools/build_dist.sh -t (install test) ran "python -m pyModbusTCP.cli" (no such module) instead of
+      pyModbusTCP.tools, it also checks the release date of the CHANGES entry and the pre-release pins of the docs.
+    - build: tools/code_audit.sh runs the tools of the venv (python -m, never from the PATH), from any directory,
+      with a summary and an exit status (1 if a check fails), new options -a (with the tests), -s and -o.
+    - tests: type hints on the tests, "mypy --strict tests" passes.
+
+0.4.0a1 2026-10-15 (alpha: the command line tools, their options and output, may still change before 0.4.0)
 
     Breaking changes:
 
     - DataBank: remove deprecated class methods (get_bits, set_bits, get_words and set_words).
-    - DataBank: set_*() methods raise a TypeError on non-integer items and a ValueError on registers values out of
+    - DataBank: set_*() methods raise a TypeError on non-integer items and a ValueError on register values out of
                 the 0-65535 range (values were silently converted before, see below).
     - ModbusClient: non-integer arguments raise a TypeError, custom_request() checks its pdu argument
                     (TypeError/ValueError) and auto_open, auto_close and no_delay only accept bool or int values.
@@ -33,20 +98,20 @@ Revision history for pyModbusTCP
       functions, TCP layer, argument checks...) with the same layout for both. No change for the users: same
       imports, same logger names, nested names kept (ModbusServer.PDU, ModbusServer.NetworkError...). Exceptions
       of the server are now shown as pyModbusTCP.server.errors.NetworkError (and so on) in tracebacks.
-    - new module pyModbusTCP.tools: command line tools (Modbus/TCP server and client, TCP to RTU and RTU to TCP
+    - new package pyModbusTCP.tools: command line tools (Modbus/TCP server and client, TCP to RTU and RTU to TCP
       gateways), run them with "python -m pyModbusTCP.tools {server,client,tcp2rtu,rtu2tcp}". The gateways need
       pyserial, a new optional dependency: "pip install pyModbusTCP[serial]".
     - new package pyModbusTCP-cli (directory of the same name, no code): installs the tools as the commands
       mbtcp-server, mbtcp-client, mbtcp-tcp2rtu and mbtcp-rtu2tcp, with pyserial. Install it with
       "pip install pyModbusTCP[tools]" or "pipx install pyModbusTCP-cli". A plain "pip install pyModbusTCP" puts
       no command in the PATH and still has no dependency.
-    - build: migrate from setup.py to pyproject.toml, with the hatchling build backend (no more MANIFEST.in, tests are
-      no longer in the sdist).
+    - build: migrate from setup.py to pyproject.toml, with the hatchling build backend (no MANIFEST.in anymore, tests
+      are no longer in the sdist).
     - fix ModbusClient: is_open is now False only for a closed socket (file descriptor 0 is valid).
     - fix ModbusClient: non-integer arguments (float, str...) now raise a TypeError instead of an uncaught struct.error.
     - fix ModbusClient: treat socket.gaierror as MB_CONNECT_ERR (like any other connect error).
-    - fix ModbusClient: timeout is now a limit for the whole request (send + receive) and no more for each socket I/O. A
-                        server sending its response byte by byte could hold the client much longer than timeout.
+    - fix ModbusClient: timeout is now a limit for the whole request (send + receive) and no longer for each socket I/O.
+                        A server sending its response byte by byte could hold the client much longer than timeout.
     - fix ModbusClient: validate write_multiple_coils items to reject non-integer values (like 'a', None, [], 1.5),
                         matching write_single_coil behavior.
     - fix ModbusClient: write_multiple_coils() and write_multiple_registers() now set last_error (MB_RECV_ERR) when the
@@ -71,7 +136,7 @@ Revision history for pyModbusTCP
     - fix ModbusServer: for functions 0x0F, 0x10 and 0x17 the byte count must exactly match the quantity.
     - fix ModbusServer: Read Device Identification (0x2B/0x0E) compliance with the spec (stream access restarts at the
                         first object of the category, an unknown object in individual access gets exception 0x02).
-    - fix ModbusServer: support MBAP header length from 2 to 253.
+    - fix ModbusServer: support MBAP header length from 2 to 254.
     - fix ModbusServer: limit client info to (address, port) for IPv6 peers.
     - fix DataBank: set_coils(), set_discrete_inputs(), set_holding_registers() and set_input_registers() now check
                     their input. Non-integer items (float, str, None...) raise a TypeError (numpy integers and

{pymodbustcp-0.4.0a1 → pymodbustcp-0.4.0a2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: pyModbusTCP
-Version: 0.4.0a1
+Version: 0.4.0a2
 Summary: A simple Modbus/TCP library for Python
 Project-URL: Documentation, https://pymodbustcp.readthedocs.io/
 Project-URL: Source, https://github.com/sourceperl/pyModbusTCP
@@ -24,13 +24,13 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: System :: Networking
 Classifier: Typing :: Typed
 Requires-Python: >=3.10
+Provides-Extra: cli
+Requires-Dist: pymodbustcp-cli; extra == 'cli'
 Provides-Extra: serial
 Requires-Dist: pyserial<4,>=3.5; extra == 'serial'
-Provides-Extra: tools
-Requires-Dist: pymodbustcp-cli; extra == 'tools'
 Description-Content-Type: text/markdown
 
-# pyModbusTCP [![Tests](https://github.com/sourceperl/pyModbusTCP/actions/workflows/tests.yml/badge.svg?branch=master)](https://github.com/sourceperl/pyModbusTCP/actions/workflows/tests.yml) [![Documentation](https://readthedocs.org/projects/pymodbustcp/badge/?version=latest)](https://pymodbustcp.readthedocs.io/)
+# pyModbusTCP [![Tests](https://github.com/sourceperl/pyModbusTCP/actions/workflows/tests.yml/badge.svg?branch=master)](https://github.com/sourceperl/pyModbusTCP/actions/workflows/tests.yml)
 
 A simple Modbus/TCP client and server library for Python.
 
@@ -42,7 +42,7 @@ The module is currently tested on Python 3.10, 3.11, 3.12, 3.13 and 3.14, on Lin
 
 ## Documentation
 
-Documentation of the last release is available online at https://pymodbustcp.readthedocs.io/.
+Documentation of the latest release is available online at https://pymodbustcp.readthedocs.io/.
 
 ## Security
 
@@ -63,7 +63,7 @@ source venv/bin/activate
 From PyPI, the easy way:
 
 ```bash
-# install the last available release (stable)
+# install the latest available release (stable)
 pip install pyModbusTCP
 ```
 
@@ -77,7 +77,7 @@ options and their output may still change. pip never installs a pre-release by d
 
 ```bash
 # a specific pre-release
-pip install pyModbusTCP==0.4.0a1
+pip install pyModbusTCP==0.4.0a2
 # or the latest release, pre-releases included
 pip install --pre pyModbusTCP
 ```
@@ -165,8 +165,8 @@ server.start()
 
 ## Command line tools
 
-***The tools are new in 0.4.0 (only pre-releases for now): without a version or `--pre`, `pip install "pyModbusTCP"`
-installs the stable 0.3.1, without the tools (pip only shows a warning).***
+***The tools are new in 0.4.0 (only pre-releases for now): without a version or `--pre`,
+`pip install "pyModbusTCP[cli]"` installs the stable 0.3.1, without the tools (pip only shows a warning).***
 
 The library comes with command line tools: a Modbus/TCP server, a Modbus/TCP client, and two gateways between
 Modbus/TCP and Modbus/RTU (serial line). They run from the library itself:
@@ -186,7 +186,7 @@ install the optional package pyModbusTCP-cli. A plain `pip install pyModbusTCP`
 
 ```bash
 # in a virtual environment, with the library
-pip install "pyModbusTCP[tools]==0.4.0a1"
+pip install "pyModbusTCP[cli]==0.4.0a2"
 # or as isolated command line tools
 pipx install pyModbusTCP-cli
 ```

{pymodbustcp-0.4.0a1 → pymodbustcp-0.4.0a2}/README.md

@@ -1,4 +1,4 @@
-# pyModbusTCP [![Tests](https://github.com/sourceperl/pyModbusTCP/actions/workflows/tests.yml/badge.svg?branch=master)](https://github.com/sourceperl/pyModbusTCP/actions/workflows/tests.yml) [![Documentation](https://readthedocs.org/projects/pymodbustcp/badge/?version=latest)](https://pymodbustcp.readthedocs.io/)
+# pyModbusTCP [![Tests](https://github.com/sourceperl/pyModbusTCP/actions/workflows/tests.yml/badge.svg?branch=master)](https://github.com/sourceperl/pyModbusTCP/actions/workflows/tests.yml)
 
 A simple Modbus/TCP client and server library for Python.
 
@@ -10,7 +10,7 @@ The module is currently tested on Python 3.10, 3.11, 3.12, 3.13 and 3.14, on Lin
 
 ## Documentation
 
-Documentation of the last release is available online at https://pymodbustcp.readthedocs.io/.
+Documentation of the latest release is available online at https://pymodbustcp.readthedocs.io/.
 
 ## Security
 
@@ -31,7 +31,7 @@ source venv/bin/activate
 From PyPI, the easy way:
 
 ```bash
-# install the last available release (stable)
+# install the latest available release (stable)
 pip install pyModbusTCP
 ```
 
@@ -45,7 +45,7 @@ options and their output may still change. pip never installs a pre-release by d
 
 ```bash
 # a specific pre-release
-pip install pyModbusTCP==0.4.0a1
+pip install pyModbusTCP==0.4.0a2
 # or the latest release, pre-releases included
 pip install --pre pyModbusTCP
 ```
@@ -133,8 +133,8 @@ server.start()
 
 ## Command line tools
 
-***The tools are new in 0.4.0 (only pre-releases for now): without a version or `--pre`, `pip install "pyModbusTCP"`
-installs the stable 0.3.1, without the tools (pip only shows a warning).***
+***The tools are new in 0.4.0 (only pre-releases for now): without a version or `--pre`,
+`pip install "pyModbusTCP[cli]"` installs the stable 0.3.1, without the tools (pip only shows a warning).***
 
 The library comes with command line tools: a Modbus/TCP server, a Modbus/TCP client, and two gateways between
 Modbus/TCP and Modbus/RTU (serial line). They run from the library itself:
@@ -154,7 +154,7 @@ install the optional package pyModbusTCP-cli. A plain `pip install pyModbusTCP`
 
 ```bash
 # in a virtual environment, with the library
-pip install "pyModbusTCP[tools]==0.4.0a1"
+pip install "pyModbusTCP[cli]==0.4.0a2"
 # or as isolated command line tools
 pipx install pyModbusTCP-cli
 ```

{pymodbustcp-0.4.0a1 → pymodbustcp-0.4.0a2}/pyModbusTCP/client/_errors.py

@@ -3,7 +3,6 @@
 
 class InternalError(Exception):
     """ Base of the internal errors of a request (turned into last_error by the client). """
-    pass
 
 
 class NetworkError(InternalError):
@@ -19,5 +18,5 @@ class ModbusExcept(InternalError):
     """ Modbus exception returned by the server: code is an EXP_xxx constant. """
 
     def __init__(self, code: int):
-        super().__init__('modbus exception 0x%02X' % code)
+        super().__init__(f'modbus exception 0x{code:02X}')
         self.code = code

{pymodbustcp-0.4.0a1 → pymodbustcp-0.4.0a2}/pyModbusTCP/client/_functions.py

@@ -1,7 +1,8 @@
 """ pyModbusTCP client: the Modbus functions (build the request PDU, decode the reply PDU). """
 
 import struct
-from typing import TYPE_CHECKING, Iterable, List, Optional, Union
+from collections.abc import Iterable
+from typing import TYPE_CHECKING
 
 from ..constants import (
     ENCAPSULATED_INTERFACE_TRANSPORT,
@@ -18,16 +19,30 @@ from ..constants import (
     WRITE_SINGLE_COIL,
     WRITE_SINGLE_REGISTER,
 )
-from ..utils import _pack_bits, _to_bool, _to_bool_list, _to_int, _to_int_list, _unpack_bits, byte_length
-from ._common import MAX_READ_BITS, MAX_READ_REGS, MAX_WRITE_BITS, MAX_WRITE_READ_REGS, MAX_WRITE_REGS
+from ..utils import (
+    _pack_bits,
+    _to_bool,
+    _to_bool_list,
+    _to_int,
+    _to_int_list,
+    _unpack_bits,
+    byte_length,
+)
+from ._common import (
+    MAX_READ_BITS,
+    MAX_READ_REGS,
+    MAX_WRITE_BITS,
+    MAX_WRITE_READ_REGS,
+    MAX_WRITE_REGS,
+)
 from ._errors import InternalError, NetworkError
 from ._validators import check_addr_nb, check_regs_values
 from .device_id import DeviceIdentificationResponse
 
 
-def _decode_regs(data: bytes, reg_nb: int) -> List[int]:
+def _decode_regs(data: bytes, reg_nb: int) -> list[int]:
     """Decode the first reg_nb big-endian 16 bits registers of a modbus registers field."""
-    return list(struct.unpack('>%dH' % reg_nb, data[:2 * reg_nb]))
+    return list(struct.unpack(f'>{reg_nb}H', data[:2 * reg_nb]))
 
 
 class ClientFunctionsMixin:
@@ -42,7 +57,7 @@ class ClientFunctionsMixin:
         def _req_pdu(self, tx_pdu: bytes, rx_min_len: int = 2) -> bytes: ...
         def _req_except_handler(self, _except: Exception) -> None: ...
 
-    def custom_request(self, pdu: Union[bytes, bytearray]) -> Optional[bytes]:
+    def custom_request(self, pdu: bytes | bytearray) -> bytes | None:
         """Send a custom modbus request.
 
         The reply must have the same function code (or the same with the exception flag): otherwise it is an error.
@@ -59,7 +74,7 @@ class ClientFunctionsMixin:
             raise TypeError('pdu must be a bytes-like object')
         pdu = bytes(pdu)
         if not 1 <= len(pdu) <= MAX_PDU_SIZE:
-            raise ValueError('pdu length out of range (valid from 1 to %d bytes)' % MAX_PDU_SIZE)
+            raise ValueError(f'pdu length out of range (valid from 1 to {MAX_PDU_SIZE} bytes)')
         # make request
         try:
             return self._req_pdu(pdu)
@@ -68,7 +83,7 @@ class ClientFunctionsMixin:
             self._req_except_handler(e)
             return None
 
-    def _read_bits_req(self, func_code: int, bit_addr: int, bit_nb: int) -> Optional[List[bool]]:
+    def _read_bits_req(self, func_code: int, bit_addr: int, bit_nb: int) -> list[bool] | None:
         """Common part of READ_COILS and READ_DISCRETE_INPUTS (params are already checked)."""
         try:
             tx_pdu = struct.pack('>BHH', func_code, bit_addr, bit_nb)
@@ -87,7 +102,7 @@ class ClientFunctionsMixin:
             self._req_except_handler(e)
             return None
 
-    def _read_regs_req(self, func_code: int, reg_addr: int, reg_nb: int) -> Optional[List[int]]:
+    def _read_regs_req(self, func_code: int, reg_addr: int, reg_nb: int) -> list[int] | None:
         """Common part of READ_HOLDING_REGISTERS and READ_INPUT_REGISTERS (params are already checked)."""
         try:
             tx_pdu = struct.pack('>BHH', func_code, reg_addr, reg_nb)
@@ -99,7 +114,7 @@ class ClientFunctionsMixin:
             return None
 
     @staticmethod
-    def _decode_regs_reply(rx_pdu: bytes, reg_nb: int) -> List[int]:
+    def _decode_regs_reply(rx_pdu: bytes, reg_nb: int) -> list[int]:
         """Decode a [func code, byte count, registers...] reply PDU (functions 0x03, 0x04 and 0x17)."""
         # extract field "byte count"
         byte_count = rx_pdu[1]
@@ -124,7 +139,7 @@ class ClientFunctionsMixin:
             self._req_except_handler(e)
             return False
 
-    def read_coils(self, bit_addr: int, bit_nb: int = 1) -> Optional[List[bool]]:
+    def read_coils(self, bit_addr: int, bit_nb: int = 1) -> list[bool] | None:
         """Modbus function READ_COILS (0x01).
 
         :param bit_addr: bit address (0 to 65535)
@@ -141,7 +156,7 @@ class ClientFunctionsMixin:
         # make request
         return self._read_bits_req(READ_COILS, bit_addr, bit_nb)
 
-    def read_discrete_inputs(self, bit_addr: int, bit_nb: int = 1) -> Optional[List[bool]]:
+    def read_discrete_inputs(self, bit_addr: int, bit_nb: int = 1) -> list[bool] | None:
         """Modbus function READ_DISCRETE_INPUTS (0x02).
 
         :param bit_addr: bit address (0 to 65535)
@@ -158,7 +173,7 @@ class ClientFunctionsMixin:
         # make request
         return self._read_bits_req(READ_DISCRETE_INPUTS, bit_addr, bit_nb)
 
-    def read_holding_registers(self, reg_addr: int, reg_nb: int = 1) -> Optional[List[int]]:
+    def read_holding_registers(self, reg_addr: int, reg_nb: int = 1) -> list[int] | None:
         """Modbus function READ_HOLDING_REGISTERS (0x03).
 
         :param reg_addr: register address (0 to 65535)
@@ -175,7 +190,7 @@ class ClientFunctionsMixin:
         # make request
         return self._read_regs_req(READ_HOLDING_REGISTERS, reg_addr, reg_nb)
 
-    def read_input_registers(self, reg_addr: int, reg_nb: int = 1) -> Optional[List[int]]:
+    def read_input_registers(self, reg_addr: int, reg_nb: int = 1) -> list[int] | None:
         """Modbus function READ_INPUT_REGISTERS (0x04).
 
         :param reg_addr: register address (0 to 65535)
@@ -193,7 +208,7 @@ class ClientFunctionsMixin:
         return self._read_regs_req(READ_INPUT_REGISTERS, reg_addr, reg_nb)
 
     def read_device_identification(self, read_code: int = 1,
-                                   object_id: int = 0) -> Optional[DeviceIdentificationResponse]:
+                                   object_id: int = 0) -> DeviceIdentificationResponse | None:
         """Modbus function Read Device Identification (0x2B/0x0E).
 
         :param read_code: read device id code, 1 to 3 for respectively: basic, regular and extended stream access,
@@ -326,14 +341,14 @@ class ClientFunctionsMixin:
         check_addr_nb(regs_addr, len(regs_value), MAX_WRITE_REGS, 'regs_addr', 'number of registers', 'write')
         check_regs_values(regs_value, 'regs_value')
         # build PDU: header + registers part (pack all registers in one call)
-        pdu_regs_part = struct.pack('>%dH' % len(regs_value), *regs_value)
+        pdu_regs_part = struct.pack(f'>{len(regs_value)}H', *regs_value)
         tx_pdu = struct.pack('>BHHB', WRITE_MULTIPLE_REGISTERS, regs_addr, len(regs_value), len(pdu_regs_part))
         tx_pdu += pdu_regs_part
         # make request
         return self._write_req(tx_pdu, regs_addr, len(regs_value))
 
     def write_read_multiple_registers(self, write_addr: int, write_values: Iterable[int],
-                                      read_addr: int, read_nb: int = 1) -> Optional[List[int]]:
+                                      read_addr: int, read_nb: int = 1) -> list[int] | None:
         """Modbus function WRITE_READ_MULTIPLE_REGISTERS (0x17).
 
         :param write_addr: write registers address (0 to 65535)
@@ -359,7 +374,7 @@ class ClientFunctionsMixin:
         # make request
         try:
             # build PDU: header + registers part (pack all registers in one call)
-            pdu_regs_part = struct.pack('>%dH' % len(write_values), *write_values)
+            pdu_regs_part = struct.pack(f'>{len(write_values)}H', *write_values)
             tx_pdu = struct.pack('>BHHHHB', WRITE_READ_MULTIPLE_REGISTERS, read_addr, read_nb,
                                  write_addr, len(write_values), len(pdu_regs_part))
             tx_pdu += pdu_regs_part

{pymodbustcp-0.4.0a1 → pymodbustcp-0.4.0a2}/pyModbusTCP/client/_transport.py

@@ -6,7 +6,6 @@ import struct
 import time
 from binascii import hexlify
 from socket import AF_UNSPEC, IPPROTO_TCP, SOCK_STREAM, TCP_NODELAY
-from typing import Optional
 
 from ..constants import (
     MB_CONNECT_ERR,
@@ -36,7 +35,7 @@ class ClientTransportMixin:
     auto_open: bool
     auto_close: bool
     _no_delay: bool
-    _sock: Optional[socket.socket]
+    _sock: socket.socket | None
     _deadline: float
     _transaction_id: int
 
@@ -60,11 +59,12 @@ class ClientTransportMixin:
         #          AF_UNSPEC -> IPv6 (priority on some system) or 4
         try:
             addr_infos = socket.getaddrinfo(self.host, self.port, AF_UNSPEC, SOCK_STREAM)
-        except socket.gaierror as e:
+        except (socket.gaierror, UnicodeError) as e:
             # name resolution failure: report it like any other connect error (no exception for the caller)
-            raise NetworkError(MB_CONNECT_ERR, 'host name resolution error: %s' % e)
+            # (UnicodeError: a name that the IDNA codec can't encode, like a label too long once encoded)
+            raise NetworkError(MB_CONNECT_ERR, f'host name resolution error: {e}') from None
         # try each address in turn, keep the last failure reason for the error message
-        last_err: Optional[OSError] = None
+        last_err: OSError | None = None
         for af, sock_type, proto, _canon_name, sa in addr_infos:
             try:
                 self._sock = socket.socket(af, sock_type, proto)
@@ -84,7 +84,7 @@ class ClientTransportMixin:
             break
         # check connect status
         if not self.is_open:
-            reason = 'connection refused' if last_err is None else 'connect error: %s' % last_err
+            reason = 'connection refused' if last_err is None else f'connect error: {last_err}'
             raise NetworkError(MB_CONNECT_ERR, reason)
 
     def close(self) -> None:
@@ -141,7 +141,7 @@ class ClientTransportMixin:
             # restore the full timeout (it's reduced by _recv() to the time remaining in the previous request)
             self._set_sock_timeout(self.timeout)
             self._sock.sendall(frame)
-        except socket.timeout:
+        except TimeoutError:
             self.close()
             raise NetworkError(MB_TIMEOUT_ERR, 'timeout error')
         except OSError:
@@ -184,7 +184,7 @@ class ClientTransportMixin:
         try:
             self._set_sock_timeout(remaining)
             r_buffer = self._sock.recv(size)
-        except socket.timeout:
+        except TimeoutError:
             self.close()
             raise NetworkError(MB_TIMEOUT_ERR, 'timeout error')
         except OSError:
@@ -246,8 +246,8 @@ class ClientTransportMixin:
         # extract function code: it must be the one of the request (with or without the exception flag)
         rx_fc = rx_pdu[0]
         if rx_fc & 0x7f != func_code:
-            raise NetworkError(MB_RECV_ERR, 'function code mismatch (0x%02X for a 0x%02X request)'
-                               % (rx_fc, func_code))
+            raise NetworkError(MB_RECV_ERR,
+                               f'function code mismatch (0x{rx_fc:02X} for a 0x{func_code:02X} request)')
         # check except status
         if rx_fc >= 0x80:
             exp_code = rx_pdu[1]
@@ -292,4 +292,3 @@ class ClientTransportMixin:
 
     def on_tx_rx(self, frame: bytes, is_tx: bool) -> None:
         """Call for each Tx/Rx (for user purposes)."""
-        pass

{pymodbustcp-0.4.0a1 → pymodbustcp-0.4.0a2}/pyModbusTCP/client/_validators.py

@@ -1,7 +1,6 @@
 """ pyModbusTCP client: checks of the ModbusClient settings and of the request arguments. """
 
 import math
-from typing import List
 
 from ..utils import valid_host
 
@@ -12,20 +11,20 @@ def check_addr_nb(addr: int, nb: int, max_nb: int, addr_name: str, nb_name: str,
     :raises ValueError: if address, number of items or the end of the area is out of range
     """
     if not 0 <= addr <= 0xffff:
-        raise ValueError('%s out of range (valid from 0 to 65535)' % addr_name)
+        raise ValueError(f'{addr_name} out of range (valid from 0 to 65535)')
     if not 1 <= nb <= max_nb:
-        raise ValueError('%s out of range (valid from 1 to %d)' % (nb_name, max_nb))
+        raise ValueError(f'{nb_name} out of range (valid from 1 to {max_nb})')
     if addr + nb > 0x10000:
-        raise ValueError('%s after end of modbus address space' % action)
+        raise ValueError(f'{action} after end of modbus address space')
 
 
-def check_regs_values(values: List[int], name: str) -> None:
+def check_regs_values(values: list[int], name: str) -> None:
     """Check that every register value fit in 16 bits (values is a non-empty list of int).
 
     :raises ValueError: if a value is out of the 0 to 65535 range
     """
     if min(values) < 0 or max(values) > 0xffff:
-        raise ValueError('%s list contains out of range values' % name)
+        raise ValueError(f'{name} list contains out of range values')
 
 
 def validate_host(value: object) -> str:

{pymodbustcp-0.4.0a1 → pymodbustcp-0.4.0a2}/pyModbusTCP/client/device_id.py

@@ -1,7 +1,6 @@
 """ pyModbusTCP client: DeviceIdentificationResponse, result of the read device identification function. """
 
 from dataclasses import dataclass, field
-from typing import Dict, Optional
 
 
 @dataclass
@@ -20,32 +19,32 @@ class DeviceIdentificationResponse:
     conformity_level: int = 0
     more_follows: int = 0
     next_object_id: int = 0
-    objects_by_id: Dict[int, bytes] = field(default_factory=dict)
+    objects_by_id: dict[int, bytes] = field(default_factory=dict)
 
     @property
-    def vendor_name(self) -> Optional[bytes]:
+    def vendor_name(self) -> bytes | None:
         return self.objects_by_id.get(0x00)
 
     @property
-    def product_code(self) -> Optional[bytes]:
+    def product_code(self) -> bytes | None:
         return self.objects_by_id.get(0x01)
 
     @property
-    def major_minor_revision(self) -> Optional[bytes]:
+    def major_minor_revision(self) -> bytes | None:
         return self.objects_by_id.get(0x02)
 
     @property
-    def vendor_url(self) -> Optional[bytes]:
+    def vendor_url(self) -> bytes | None:
         return self.objects_by_id.get(0x03)
 
     @property
-    def product_name(self) -> Optional[bytes]:
+    def product_name(self) -> bytes | None:
         return self.objects_by_id.get(0x04)
 
     @property
-    def model_name(self) -> Optional[bytes]:
+    def model_name(self) -> bytes | None:
         return self.objects_by_id.get(0x05)
 
     @property
-    def user_application_name(self) -> Optional[bytes]:
+    def user_application_name(self) -> bytes | None:
         return self.objects_by_id.get(0x06)