update close().

Author: janiversen

examples/client_async.py

@@ -124,7 +124,7 @@ async def run_async_client(client, modbus_calls=None):
     assert client.connected
     if modbus_calls:
         await modbus_calls(client)
-    await client.close()
+    client.close()
     _logger.info("### End of Program")
 
 

pymodbus/client/base.py

@@ -213,7 +213,9 @@ def connection_lost(self, reason):
             if hasattr(self.transport, "_sock"):
                 self.transport._sock.close()  # pylint: disable=protected-access
             self.transport = None
-        self.loop.call_soon(self.close, self)
+        x = self.delay_ms
+        self.close()
+        self.delay_ms = x
 
         Log.info("Protocol lost connection.")
         self._launch_reconnect()
@@ -261,7 +263,7 @@ def _build_response(self, tid):
             self.transaction.addTransaction(my_future, tid)
         return my_future
 
-    async def close(self, reconnect: bool = False) -> None:
+    def close(self, reconnect: bool = False) -> None:
         """Close connection.
 
         :param reconnect: (default false), try to reconnect
@@ -272,19 +274,15 @@ async def close(self, reconnect: bool = False) -> None:
             self.transport.abort()
             self.transport.close()
             self.transport = None
-            await asyncio.sleep(0.1)
-
         if self._reconnect_task:
             self._reconnect_task.cancel()
             self._reconnect_task = None
-            await asyncio.sleep(0.1)
 
         if not reconnect:
             self.delay_ms = 0
             return
 
         self._launch_reconnect()
-        await asyncio.sleep(0.1)
 
     def _launch_reconnect(self):
         """Launch delayed reconnection coroutine"""
@@ -367,7 +365,7 @@ def __exit__(self, klass, value, traceback):
 
     async def __aexit__(self, klass, value, traceback):
         """Implement the client with exit block."""
-        await self.close()
+        self.close()
 
     def __str__(self):
         """Build a string representation of the connection.

pymodbus/client/serial.py

@@ -42,7 +42,7 @@ async def run():
 
             await client.connect()
             ...
-            await client.close()
+            client.close()
     """
 
     transport = None
@@ -100,7 +100,7 @@ async def connect(self):  # pylint: disable=invalid-overridden-method
             Log.info("Connected to {}", self.params.port)
         except Exception as exc:  # pylint: disable=broad-except
             Log.warning("Failed to connect: {}", exc)
-            await self.close(reconnect=True)
+            self.close(reconnect=True)
         return self.connected
 
 

pymodbus/client/tcp.py

@@ -34,7 +34,7 @@ async def run():
 
             await client.connect()
             ...
-            await client.close()
+            client.close()
     """
 
     def __init__(
@@ -95,7 +95,7 @@ async def _connect(self):
                 )
         except Exception as exc:  # pylint: disable=broad-except
             Log.warning("Failed to connect: {}", exc)
-            await self.close(reconnect=True)
+            self.close(reconnect=True)
         else:
             Log.info("Connected to {}:{}.", self.params.host, self.params.port)
             self.reset_delay()

pymodbus/client/tls.py

@@ -66,7 +66,7 @@ async def run():
 
             await client.connect()
             ...
-            await client.close()
+            client.close()
     """
 
     def __init__(
@@ -104,7 +104,7 @@ async def _connect(self):
             )
         except Exception as exc:  # pylint: disable=broad-except
             Log.warning("Failed to connect: {}", exc)
-            await self.close(reconnect=True)
+            self.close(reconnect=True)
             return
         Log.info("Connected to {}:{}.", self.params.host, self.params.port)
         self.reset_delay()

pymodbus/client/udp.py

@@ -37,7 +37,7 @@ async def run():
 
             await client.connect()
             ...
-            await client.close()
+            client.close()
     """
 
     def __init__(
@@ -95,7 +95,7 @@ async def _connect(self):
             return endpoint
         except Exception as exc:  # pylint: disable=broad-except
             Log.warning("Failed to connect: {}", exc)
-            await self.close(reconnect=True)
+            self.close(reconnect=True)
 
 
 class ModbusUdpClient(ModbusBaseClient):

pymodbus/transport/base.py

@@ -91,7 +91,7 @@ def send(self, data: bytes) -> bool:
         Log.debug("send: {}", data, ":hex")
         return False
 
-    async def close(self) -> None:
+    def close(self) -> None:
         """Close the underlying  connection."""
 
     # ----------------------------------------------------------------------- #
@@ -103,7 +103,7 @@ async def __aenter__(self):
 
     async def __aexit__(self, _class, _value, _traceback) -> None:
         """Implement the client with async exit block."""
-        await self.close()
+        self.close()
 
     def __str__(self) -> str:
         """Build a string representation of the connection."""

test/test_client.py

@@ -320,7 +320,7 @@ async def test_client_connection_lost():
     assert not client.connected
     client.connection_lost(mock.sentinel.PROTOCOL)
     assert not client.connected
-    await client.close()
+    client.close()
 
 
 async def test_client_base_async():

test/test_server_task.py

@@ -153,7 +153,7 @@ async def test_async_task_no_server(comm):
     await asyncio.sleep(0.1)
     with pytest.raises((asyncio.exceptions.TimeoutError, ConnectionException)):
         await client.read_coils(1, 1, slave=0x01)
-    await client.close()
+    client.close()
 
 
 @pytest.mark.xdist_group(name="server_serialize")
@@ -171,7 +171,7 @@ async def test_async_task_ok(comm):
     rr = await client.read_coils(1, 1, slave=0x01)
     assert len(rr.bits) == 8
 
-    await client.close()
+    client.close()
     await asyncio.sleep(0.1)
     assert not client.transport
     await server.ServerAsyncStop()
@@ -194,7 +194,7 @@ async def test_async_task_reuse(comm):
     rr = await client.read_coils(1, 1, slave=0x01)
     assert len(rr.bits) == 8
 
-    await client.close()
+    client.close()
     await asyncio.sleep(0.1)
     assert not client.transport
 
@@ -204,7 +204,7 @@ async def test_async_task_reuse(comm):
     rr = await client.read_coils(1, 1, slave=0x01)
     assert len(rr.bits) == 8
 
-    await client.close()
+    client.close()
     await asyncio.sleep(0.1)
     assert not client.transport
 
@@ -254,7 +254,7 @@ async def test_async_task_server_stop(comm):
     rr = await client.read_coils(1, 1, slave=0x01)
     assert len(rr.bits) == 8
 
-    await client.close()
+    client.close()
     await asyncio.sleep(0.5)
     assert not client.transport
     await server.ServerAsyncStop()