new I.

Author: janiversen

pymodbus/transport/transport_serial.py

@@ -38,14 +38,23 @@ def setup(self):
 
     def close(self, exc=None):
         """Close the transport gracefully."""
+        if not self.sync_serial:
+            return
+        with contextlib.suppress(Exception):
+            self.sync_serial.flush()
+
         if self._has_reader:
             if os.name == "nt":
                 self._has_reader.cancel()
             else:
                 self.async_loop.remove_reader(self.sync_serial.fileno())
             self._has_reader = False
         self._remove_writer()
-        self.async_loop.call_soon(self._call_connection_lost, exc)
+        self.sync_serial.close()
+        self.sync_serial = None
+        with contextlib.suppress(Exception):
+            self._protocol.connection_lost(exc)
+        self._write_buffer.clear()
 
     def write(self, data):
         """Write some data to the transport."""
@@ -121,7 +130,7 @@ def _read_ready(self):
         try:
             data = self.sync_serial.read(1024)
         except serial.SerialException as exc:
-            self.close(exc)
+            self.close(exc=exc)
         else:
             if data:
                 self._protocol.data_received(data)
@@ -138,7 +147,7 @@ def _write_ready(self):
         except (BlockingIOError, InterruptedError):
             return
         except serial.SerialException as exc:
-            self.close(exc)
+            self.close(exc=exc)
 
     if os.name == "nt":
 
@@ -151,8 +160,7 @@ def _poll_read(self):
                     if self.sync_serial.in_waiting:
                         self._read_ready()
                 except serial.SerialException as exc:
-                    self.async_loop.call_soon(self._call_connection_lost, exc)
-                    self.abort()
+                    self.close(exc=exc)
 
         def _poll_write(self):
             if self._has_writer:
@@ -173,21 +181,6 @@ def _remove_writer(self):
                 self.async_loop.remove_writer(self.sync_serial.fileno())
                 self._has_writer = False
 
-    def _call_connection_lost(self, exc):
-        """Close the connection."""
-        if self.sync_serial:
-            with contextlib.suppress(Exception):
-                self.sync_serial.flush()
-
-            self.sync_serial.close()
-            self.sync_serial = None
-        if self._protocol:
-            with contextlib.suppress(Exception):
-                self._protocol.connection_lost(exc)
-
-            self._write_buffer.clear()
-        self._write_buffer.clear()
-
 
 async def create_serial_connection(loop, protocol_factory, *args, **kwargs):
     """Create a connection to a new serial port instance."""

test/sub_transport/test_basic.py

@@ -323,6 +323,7 @@ async def test_external_methods(self):
         comm.write(b"abcd")
         comm.flush()
         comm.close()
+        comm = SerialTransport(mock.MagicMock(), mock.Mock(), "dummy")
         comm.abort()
         assert await create_serial_connection(
             asyncio.get_running_loop(), mock.Mock, url="dummy"