Dev3.7 async keyword changes

.travis.yml

@@ -10,6 +10,8 @@ matrix:
     python: "3.5"
   - os: linux
     python: "3.6"
+#  - os: linux
+#    python: "3.7"
   - os: osx
     osx_image: xcode8.3
     language: generic

CHANGELOG.rst

@@ -49,10 +49,14 @@ Version 1.5.1
 
     res = client.read_holding_registers(...)
     if not res.isError():
+
         # proceed
+
     else:
         # handle error or raise
 
+    """
+
 * Add examples for MEI read device information request
 
 Version 1.5.0

doc/conf.py

@@ -45,7 +45,7 @@
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
-extensions = ['sphinx.ext.autodoc', 'recommonmark']
+extensions = ['sphinx.ext.autodoc', 'm2r', 'recommonmark']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -112,7 +112,8 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+# html_static_path = ['_static']
+html_static_path = []
 
 # Custom sidebar templates, must be a dictionary that maps document names
 # to template names.

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

@@ -0,0 +1,8 @@
+pymodbus\.client\.asynchronous\.asyncio package
+===============================================
+
+.. automodule:: pymodbus.client.asynchronous.asyncio
+    :members:
+    :undoc-members:
+    :show-inheritance:
+

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

@@ -0,0 +1,36 @@
+pymodbus\.client\.asynchronous\.factory package
+===============================================
+
+.. automodule:: pymodbus.client.asynchronous.factory
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+Submodules
+----------
+
+pymodbus\.client\.asynchronous\.factory\.serial module
+------------------------------------------------------
+
+.. automodule:: pymodbus.client.asynchronous.factory.serial
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+pymodbus\.client\.asynchronous\.factory\.tcp module
+---------------------------------------------------
+
+.. automodule:: pymodbus.client.asynchronous.factory.tcp
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+pymodbus\.client\.asynchronous\.factory\.udp module
+---------------------------------------------------
+
+.. automodule:: pymodbus.client.asynchronous.factory.udp
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+

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

@@ -0,0 +1,55 @@
+pymodbus\.client\.asynchronous package
+======================================
+
+.. automodule:: pymodbus.client.asynchronous
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+Subpackages
+-----------
+
+.. toctree::
+
+    pymodbus.client.asynchronous.asyncio
+    pymodbus.client.asynchronous.factory
+    pymodbus.client.asynchronous.schedulers
+    pymodbus.client.asynchronous.tornado
+    pymodbus.client.asynchronous.twisted
+
+Submodules
+----------
+
+pymodbus\.client\.asynchronous\.serial module
+---------------------------------------------
+
+.. automodule:: pymodbus.client.asynchronous.serial
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+pymodbus\.client\.asynchronous\.tcp module
+------------------------------------------
+
+.. automodule:: pymodbus.client.asynchronous.tcp
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+pymodbus\.client\.asynchronous\.thread module
+---------------------------------------------
+
+.. automodule:: pymodbus.client.asynchronous.thread
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+pymodbus\.client\.asynchronous\.udp module
+------------------------------------------
+
+.. automodule:: pymodbus.client.asynchronous.udp
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+

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

@@ -0,0 +1,8 @@
+pymodbus\.client\.asynchronous\.schedulers package
+==================================================
+
+.. automodule:: pymodbus.client.asynchronous.schedulers
+    :members:
+    :undoc-members:
+    :show-inheritance:
+

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

@@ -0,0 +1,8 @@
+pymodbus\.client\.asynchronous\.tornado package
+===============================================
+
+.. automodule:: pymodbus.client.asynchronous.tornado
+    :members:
+    :undoc-members:
+    :show-inheritance:
+

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

@@ -0,0 +1,8 @@
+pymodbus\.client\.asynchronous\.twisted package
+===============================================
+
+.. automodule:: pymodbus.client.asynchronous.twisted
+    :members:
+    :undoc-members:
+    :show-inheritance:
+

doc/source/library/pymodbus.client.rst

@@ -11,7 +11,7 @@ Subpackages
 
 .. toctree::
 
-    pymodbus.client.async
+    pymodbus.client.asynchronous
 
 Submodules
 ----------

doc/source/library/pymodbus.server.rst

@@ -9,10 +9,10 @@ pymodbus\.server package
 Submodules
 ----------
 
-pymodbus\.server\.async module
-------------------------------
+pymodbus\.server\.asynchronous module
+-------------------------------------
 
-.. automodule:: pymodbus.server.async
+.. automodule:: pymodbus.server.asynchronous
     :members:
     :undoc-members:
     :show-inheritance:

examples/common/async_asyncio_client.py

@@ -13,12 +13,12 @@
     import asyncio
     import logging
     # ----------------------------------------------------------------------- #
-    # Import the required async client
+    # Import the required asynchronous client
     # ----------------------------------------------------------------------- #
-    from pymodbus.client.async.tcp import AsyncModbusTCPClient as ModbusClient
-    # from pymodbus.client.async.udp import (
+    from pymodbus.client.asynchronous.tcp import AsyncModbusTCPClient as ModbusClient
+    # from pymodbus.client.asynchronous.udp import (
     #     AsyncModbusUDPClient as ModbusClient)
-    from pymodbus.client.async import schedulers
+    from pymodbus.client.asynchronous import schedulers
 
 else:
     import sys
@@ -68,7 +68,7 @@ async def start_async_test(client):
     # are not known to these tests. Furthermore, some use the same memory
     # blocks for the two sets, so a change to one is a change to the other.
     # Keep both of these cases in mind when testing as the following will
-    # _only_ pass with the supplied async modbus server (script supplied).
+    # _only_ pass with the supplied asynchronous modbus server (script supplied).
     # ----------------------------------------------------------------------- #
     log.debug("Write to a Coil and read back")
     rq = await client.write_coil(0, True, unit=UNIT)

examples/common/async_asyncio_serial_client.py

@@ -12,9 +12,9 @@
 if IS_PYTHON3 and PYTHON_VERSION >= (3, 4):
     import logging
     import asyncio
-    from pymodbus.client.async.serial import (
+    from pymodbus.client.asynchronous.serial import (
         AsyncModbusSerialClient as ModbusClient)
-    from pymodbus.client.async import schedulers
+    from pymodbus.client.asynchronous import schedulers
 else:
     import sys
     sys.stderr("This example needs to be run only on python 3.4 and above")
@@ -63,7 +63,7 @@ async def start_async_test(client):
         # Furthermore, some use the same memory blocks for the two sets,
         # so a change to one is a change to the other.
         # Keep both of these cases in mind when testing as the following will
-        # _only_ pass with the supplied async modbus server (script supplied).
+        # _only_ pass with the supplied asynchronous modbus server (script supplied).
     # ----------------------------------------------------------------------- #
         log.debug("Write to a Coil and read back")
         rq = await client.write_coil(0, True, unit=UNIT)

examples/common/async_tornado_client.py

@@ -9,14 +9,14 @@
 
 import functools
 from tornado.ioloop import IOLoop
-from pymodbus.client.async import schedulers
+from pymodbus.client.asynchronous import schedulers
 
 # ---------------------------------------------------------------------------#
 # choose the requested modbus protocol
 # ---------------------------------------------------------------------------#
 
-# from pymodbus.client.async.udp import AsyncModbusUDPClient as ModbusClient
-from pymodbus.client.async.tcp import AsyncModbusTCPClient as ModbusClient
+# from pymodbus.client.asynchronous.udp import AsyncModbusUDPClient as ModbusClient
+from pymodbus.client.asynchronous.tcp import AsyncModbusTCPClient as ModbusClient
 
 # ---------------------------------------------------------------------------#
 # configure the client logging