pyModbusTCP 0.3.0__tar.gz → 0.3.1__tar.gz

{pyModbusTCP-0.3.0 → pymodbustcp-0.3.1}/CHANGES

@@ -1,5 +1,11 @@
 Revision history for pyModbusTCP
 
+0.3.1 2026-09-29
+
+    - fix ModbusServer: debug messages now include OSError exceptions produced by getpeername (thanks to Pär Åhlund).
+    - fix ModbusClient: prevent incomplete frame transmission by using sendall (thanks to aamir-azeez).
+    - updated compatibility test (python versions): remove 3.8/3.9, add 3.13/3.14.
+
 0.3.0 2024-09-04
 
     - pyModbusTCP.client: now use the standard logging method as in the server part.

{pyModbusTCP-0.3.0/pyModbusTCP.egg-info → pymodbustcp-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pyModbusTCP
-Version: 0.3.0
+Version: 0.3.1
 Summary: A simple Modbus/TCP library for Python
 Home-page: https://github.com/sourceperl/pyModbusTCP
 Author: Loic Lefebvre
@@ -8,6 +8,14 @@ Author-email: loic.celine@free.fr
 License: MIT
 Platform: any
 License-File: LICENSE
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: platform
+Dynamic: summary
 
 .. |badge_tests| image:: https://github.com/sourceperl/pyModbusTCP/actions/workflows/tests.yml/badge.svg?branch=master
                 :target: https://github.com/sourceperl/pyModbusTCP/actions/workflows/tests.yml
@@ -26,7 +34,7 @@ Since version 0.1.0, a server is also available.
 Tests
 -----
 
-The module is currently test on Python 3.8, 3.9, 3.10, 3.11 and 3.12.
+The module is currently test on Python 3.10, 3.11, 3.12, 3.13 and 3.14.
 
 For Linux, Mac OS and Windows.
 

{pyModbusTCP-0.3.0 → pymodbustcp-0.3.1}/README.rst

@@ -15,7 +15,7 @@ Since version 0.1.0, a server is also available.
 Tests
 -----
 
-The module is currently test on Python 3.8, 3.9, 3.10, 3.11 and 3.12.
+The module is currently test on Python 3.10, 3.11, 3.12, 3.13 and 3.14.
 
 For Linux, Mac OS and Windows.
 

{pyModbusTCP-0.3.0 → pymodbustcp-0.3.1}/pyModbusTCP/client.py

@@ -775,7 +775,7 @@ class ModbusClient:
             raise ModbusClient._NetworkError(MB_SOCK_CLOSE_ERR, 'try to send on a close socket')
         # send
         try:
-            self._sock.send(frame)
+            self._sock.sendall(frame)
         except socket.timeout:
             self._sock.close()
             raise ModbusClient._NetworkError(MB_TIMEOUT_ERR, 'timeout error')

{pyModbusTCP-0.3.0 → pymodbustcp-0.3.1}/pyModbusTCP/constants.py

@@ -1,7 +1,7 @@
 """ pyModbusTCP package constants definition """
 
 # Package version
-VERSION = '0.3.0'
+VERSION = '0.3.1'
 # Modbus/TCP
 MODBUS_PORT = 502
 # Modbus function code

{pyModbusTCP-0.3.0 → pymodbustcp-0.3.1}/pyModbusTCP/server.py

@@ -824,14 +824,14 @@ class ModbusServer:
             self.request.settimeout(1.0)
 
         def handle(self):
-            # try/except end current thread on ModbusServer._InternalError or socket.error
+            # try/except: end current thread on ModbusServer._InternalError, OSError or socket.error
             # this also close the current TCP session associated with it
-            # init and update server info structure
-            session_data = ModbusServer.SessionData()
-            (session_data.client.address, session_data.client.port) = self.request.getpeername()
-            # debug message
-            logger.debug('accept new connection from %r', session_data.client)
             try:
+                # init and update server info structure
+                session_data = ModbusServer.SessionData()
+                (session_data.client.address, session_data.client.port) = self.request.getpeername()
+                # debug message
+                logger.debug('accept new connection from %r', session_data.client)
                 # main processing loop
                 while True:
                     # init session data for new request
@@ -846,7 +846,7 @@ class ModbusServer:
                     self.server.engine(session_data)
                     # send the tx pdu with the last rx mbap (only length field change)
                     self._send_all(session_data.response.raw)
-            except (ModbusServer.Error, socket.error) as e:
+            except (ModbusServer.Error, OSError, socket.error) as e:
                 # debug message
                 logger.debug('Exception during request handling: %r', e)
                 # on main loop except: exit from it and cleanly close the current socket

{pyModbusTCP-0.3.0 → pymodbustcp-0.3.1/pyModbusTCP.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pyModbusTCP
-Version: 0.3.0
+Version: 0.3.1
 Summary: A simple Modbus/TCP library for Python
 Home-page: https://github.com/sourceperl/pyModbusTCP
 Author: Loic Lefebvre
@@ -8,6 +8,14 @@ Author-email: loic.celine@free.fr
 License: MIT
 Platform: any
 License-File: LICENSE
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: platform
+Dynamic: summary
 
 .. |badge_tests| image:: https://github.com/sourceperl/pyModbusTCP/actions/workflows/tests.yml/badge.svg?branch=master
                 :target: https://github.com/sourceperl/pyModbusTCP/actions/workflows/tests.yml
@@ -26,7 +34,7 @@ Since version 0.1.0, a server is also available.
 Tests
 -----
 
-The module is currently test on Python 3.8, 3.9, 3.10, 3.11 and 3.12.
+The module is currently test on Python 3.10, 3.11, 3.12, 3.13 and 3.14.
 
 For Linux, Mac OS and Windows.
 

{pyModbusTCP-0.3.0 → pymodbustcp-0.3.1}/tests/test_client_server.py

@@ -1,12 +1,15 @@
 """ Test of pyModbusTCP client-server interaction """
 
+import socket
 import unittest
+from unittest.mock import Mock
 from random import randint, getrandbits, choice
 from string import ascii_letters
 from pyModbusTCP.server import ModbusServer, DeviceIdentification
 from pyModbusTCP.client import ModbusClient, DeviceIdentificationResponse
 from pyModbusTCP.constants import SUPPORTED_FUNCTION_CODES, \
-    EXP_NONE, EXP_ILLEGAL_FUNCTION, EXP_DATA_ADDRESS, EXP_DATA_VALUE, MB_NO_ERR, MB_EXCEPT_ERR
+    EXP_NONE, EXP_ILLEGAL_FUNCTION, EXP_DATA_ADDRESS, EXP_DATA_VALUE, MB_NO_ERR, MB_EXCEPT_ERR, \
+    MB_SEND_ERR, MB_TIMEOUT_ERR
 
 
 # some const
@@ -34,6 +37,32 @@ class TestClientServer(unittest.TestCase):
         self.client.close()
         self.server.stop()
 
+    def test_request_with_short_send(self):
+        """Complete requests when a socket send accepts only a prefix."""
+        self.client.timeout = 1.0
+        self.assertTrue(self.client.open())
+        sock = self.client._sock
+        self.client._sock = Mock(wraps=sock)
+        self.client._sock.send.side_effect = lambda data: sock.send(data[:3])
+        self.assertEqual(self.client.read_holding_registers(0), [0])
+        registers = list(range(MAX_WRITABLE_REGS))
+        self.assertTrue(self.client.write_multiple_registers(0, registers))
+        self.assertEqual(self.client.read_holding_registers(0, len(registers)), registers)
+
+    def test_request_send_errors(self):
+        """Send failures keep their error codes and close the connection."""
+        for error, code in [(socket.timeout(), MB_TIMEOUT_ERR), (OSError(), MB_SEND_ERR)]:
+            with self.subTest(error=type(error).__name__):
+                self.assertTrue(self.client.open())
+                sock = Mock(wraps=self.client._sock)
+                sock.send.side_effect = error
+                sock.sendall.side_effect = error
+                self.client._sock = sock
+                self.assertIsNone(self.client.read_holding_registers(0))
+                self.assertEqual(self.client.last_error, code)
+                self.assertFalse(self.client.is_open)
+                self.assertEqual(sock.send.call_count + sock.sendall.call_count, 1)
+
     def test_default_startup_values(self):
         """Some read at random address to test startup values."""
         for addr in [randint(0, 0xffff) for _ in range(100)]: