Remove async factory. (#1001)

Author: janiversen

doc/source/library/pymodbus.client.asynchronous.factory.rst

@@ -12,7 +12,6 @@ Subpackages
 .. toctree::
 
     pymodbus.client.asynchronous.async_io
-    pymodbus.client.asynchronous.factory
 
 Submodules
 ----------

doc/source/library/pymodbus.client.asynchronous.rst

@@ -296,7 +296,7 @@ async def _connect(self):
         except Exception as exc:  # pylint: disable=broad-except
             txt = f"Failed to connect: {exc}"
             _logger.warning(txt)
-            asyncio.ensure_future(self._reconnect(), loop=self.loop)
+            asyncio.ensure_future(self._reconnect())
         else:
             txt = f"Connected to {self.host}:{self.port}."
             _logger.info(txt)
@@ -324,7 +324,7 @@ def protocol_lost_connection(self, protocol):
             self.connected = False
             self.protocol = None
             if self.host:
-                asyncio.ensure_future(self._reconnect(), loop=self.loop)
+                asyncio.ensure_future(self._reconnect())
         else:
             _logger.error(TEST_FACTORY)
 
@@ -384,7 +384,7 @@ async def connect(self):
         except Exception as exc:  # pylint: disable=broad-except
             txt = f"Failed to connect: {exc}"
             _logger.warning(txt)
-            # asyncio.asynchronous(self._reconnect(), loop=self.loop)
+            # asyncio.asynchronous(self._reconnect())
 
     def protocol_made_connection(self, protocol):
         """Notify successful connection."""
@@ -408,7 +408,7 @@ def protocol_lost_connection(self, protocol):
             self.connected = False
             self.protocol = None
             # if self.host:
-            #     asyncio.asynchronous(self._reconnect(), loop=self.loop)
+            #     asyncio.asynchronous(self._reconnect())
         else:
             _logger.error(TEST_FACTORY)
 
@@ -464,7 +464,7 @@ async def _connect(self):
         except Exception as exc:  # pylint: disable=broad-except
             txt = f"Failed to connect: {exc}"
             _logger.warning(txt)
-            asyncio.ensure_future(self._reconnect(), loop=self.loop)
+            asyncio.ensure_future(self._reconnect())
         else:
             txt = f"Connected to {self.host}:{self.port}."
             _logger.info(txt)
@@ -564,7 +564,7 @@ async def _connect(self):
         except Exception as exc:  # pylint: disable=broad-except
             txt = f"Failed to connect: {exc}"
             _logger.warning(txt)
-            asyncio.ensure_future(self._reconnect(), loop=self.loop)
+            asyncio.ensure_future(self._reconnect())
 
     def protocol_made_connection(self, protocol):
         """Notify successful connection."""
@@ -658,7 +658,7 @@ async def connect(self):
         except Exception as exc:  # pylint: disable=broad-except
             txt = f"Failed to connect: {exc}"
             _logger.warning(txt)
-            # asyncio.asynchronous(self._reconnect(), loop=self.loop)
+            # asyncio.asynchronous(self._reconnect())
 
     def protocol_made_connection(self, protocol):
         """Protocol notification of successful connection."""
@@ -682,7 +682,7 @@ def protocol_lost_connection(self, protocol):
             self.connected = False
             self.protocol = None
             # if self.host:
-            #    asyncio.asynchronous(self._reconnect(), loop=self.loop)
+            #    asyncio.asynchronous(self._reconnect())
         else:
             _logger.error(TEST_FACTORY)
 
@@ -784,7 +784,7 @@ def protocol_lost_connection(self, protocol):
             self._connected_event.clear()
             self.protocol = None
             # if self.host:
-            #     asyncio.asynchronous(self._reconnect(), loop=self.loop)
+            #     asyncio.asynchronous(self._reconnect())
         else:
             _logger.error(TEST_FACTORY)
 

pymodbus/client/asynchronous/async_io/__init__.py

@@ -1,14 +1,17 @@
 """SERIAL communication."""
+import asyncio
 import logging
 
-from pymodbus.client.asynchronous.async_io import AsyncioModbusSerialClient as serialClient
-from pymodbus.client.asynchronous.factory.serial import async_io_factory
 from pymodbus.factory import ClientDecoder
+from pymodbus.client.asynchronous.async_io import (
+    AsyncioModbusSerialClient,
+    ModbusClientProtocol,
+)
 
 _logger = logging.getLogger(__name__)
 
 
-class AsyncModbusSerialClient(serialClient):
+class AsyncModbusSerialClient(AsyncioModbusSerialClient):
     """Actual Async Serial Client to be used.
 
     To use do::
@@ -29,5 +32,18 @@ def __new__(cls, framer, port, **kwargs):
         :return:
         """
         framer = framer(ClientDecoder())
-        yieldable = async_io_factory(framer=framer, port=port, **kwargs)
-        return yieldable
+        try:
+            loop = kwargs.pop("loop", None) or asyncio.get_running_loop()
+        except RuntimeError:
+            loop = asyncio.new_event_loop()
+
+        proto_cls = kwargs.get("proto_cls") or ModbusClientProtocol
+
+        client = AsyncioModbusSerialClient(port, proto_cls, framer, **kwargs)
+        coro = client.connect
+        if not loop.is_running():
+            loop.run_until_complete(coro())
+        else:  # loop is not asyncio.get_event_loop():
+            future = asyncio.run_coroutine_threadsafe(coro(), loop=loop)
+            future.result()
+        return client