Merge branch '2.5.3' into dev

Author: dhoomakethu

CHANGELOG.rst

@@ -2,6 +2,9 @@ version 2.5.3
 ----------------------------------------------------------
 * Fix retries on tcp client failing randomly.
 * Fix Asyncio client timeout arg not being used.
+* Treat exception codes as valid responses
+* Fix examples (modbus_payload)
+* Add missing identity argument to async ModbusSerialServer
 
 version 2.5.2
 ----------------------------------------------------------

pymodbus/client/asynchronous/factory/tcp.py

@@ -90,8 +90,8 @@ def async_io_factory(host="127.0.0.1", port=Defaults.Port, **kwargs):
     """
     import asyncio
     from pymodbus.client.asynchronous.async_io import init_tcp_client
-    loop = kwargs.get("loop") or asyncio.new_event_loop()
-    proto_cls = kwargs.get("proto_cls", None)
+    loop = kwargs.pop("loop", None) or asyncio.new_event_loop()
+    proto_cls = kwargs.pop("proto_cls", None)
     if not loop.is_running():
         asyncio.set_event_loop(loop)
         cor = init_tcp_client(proto_cls, loop, host, port, **kwargs)

pymodbus/client/asynchronous/factory/tls.py

@@ -28,8 +28,8 @@ def async_io_factory(host="127.0.0.1", port=Defaults.TLSPort, sslctx=None,
     """
     import asyncio
     from pymodbus.client.asynchronous.async_io import init_tls_client
-    loop = kwargs.get("loop") or asyncio.new_event_loop()
-    proto_cls = kwargs.get("proto_cls", None)
+    loop = kwargs.pop("loop", None) or asyncio.new_event_loop()
+    proto_cls = kwargs.pop("proto_cls", None)
     if not loop.is_running():
         asyncio.set_event_loop(loop)
         cor = init_tls_client(proto_cls, loop, host, port, sslctx, server_hostname,

pymodbus/client/asynchronous/factory/udp.py

@@ -65,8 +65,8 @@ def async_io_factory(host="127.0.0.1", port=Defaults.Port, **kwargs):
     """
     import asyncio
     from pymodbus.client.asynchronous.async_io import init_udp_client
-    loop = kwargs.get("loop") or asyncio.get_event_loop()
-    proto_cls = kwargs.get("proto_cls", None)
+    loop = kwargs.pop("loop", None) or asyncio.get_event_loop()
+    proto_cls = kwargs.pop("proto_cls", None)
     cor = init_udp_client(proto_cls, loop, host, port, **kwargs)
     if not loop.is_running():
         client = loop.run_until_complete(asyncio.gather(cor))[0]