Rebase to dev3.7

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

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

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

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

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

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

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

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

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

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

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

@@ -1,7 +1,7 @@
 pymodbus\.client\.async\.twisted package
 ========================================
 
-.. automodule:: pymodbus.client.async.twisted
+.. 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

examples/common/async_tornado_client_serial.py

@@ -12,13 +12,13 @@
 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.serial import AsyncModbusSerialClient
+from pymodbus.client.asynchronous.serial import AsyncModbusSerialClient
 
 # ---------------------------------------------------------------------------#
 # configure the client logging

examples/common/async_twisted_client.py

@@ -12,9 +12,9 @@
 
 from twisted.internet import reactor
 
-from pymodbus.client.async.tcp import AsyncModbusTCPClient
-# from pymodbus.client.async.udp import AsyncModbusUDPClient
-from pymodbus.client.async import schedulers
+from pymodbus.client.asynchronous.tcp import AsyncModbusTCPClient
+# from pymodbus.client.asynchronous.udp import AsyncModbusUDPClient
+from pymodbus.client.asynchronous import schedulers
 
 # --------------------------------------------------------------------------- #
 # choose the requested modbus protocol

examples/common/async_twisted_client_serial.py

@@ -8,9 +8,9 @@
 """
 
 from twisted.internet import reactor
-from pymodbus.client.async import schedulers
-from pymodbus.client.async.serial import AsyncModbusSerialClient
-from pymodbus.client.async.twisted import ModbusClientProtocol
+from pymodbus.client.asynchronous import schedulers
+from pymodbus.client.asynchronous.serial import AsyncModbusSerialClient
+from pymodbus.client.asynchronous.twisted import ModbusClientProtocol
 
 import logging
 logging.basicConfig()

examples/common/asynchronous_processor.py

@@ -12,7 +12,7 @@
 from twisted.internet import serialport, reactor
 from twisted.internet.protocol import ClientFactory
 from pymodbus.factory import ClientDecoder
-from pymodbus.client.async.twisted import ModbusClientProtocol
+from pymodbus.client.asynchronous.twisted import ModbusClientProtocol
 
 # --------------------------------------------------------------------------- #
 # Choose the framer you want to use

examples/common/asynchronous_server.py

@@ -10,9 +10,9 @@
 # --------------------------------------------------------------------------- # 
 # import the various server implementations
 # --------------------------------------------------------------------------- # 
-from pymodbus.server.async import StartTcpServer
-from pymodbus.server.async import StartUdpServer
-from pymodbus.server.async import StartSerialServer
+from pymodbus.server.asynchronous import StartTcpServer
+from pymodbus.server.asynchronous import StartUdpServer
+from pymodbus.server.asynchronous import StartSerialServer
 
 from pymodbus.device import ModbusDeviceIdentification
 from pymodbus.datastore import ModbusSequentialDataBlock

examples/common/callback_server.py

@@ -10,7 +10,7 @@
 # --------------------------------------------------------------------------- #
 # import the modbus libraries we need
 # --------------------------------------------------------------------------- #
-from pymodbus.server.async import StartTcpServer
+from pymodbus.server.asynchronous import StartTcpServer
 from pymodbus.device import ModbusDeviceIdentification
 from pymodbus.datastore import ModbusSparseDataBlock
 from pymodbus.datastore import ModbusSlaveContext, ModbusServerContext

examples/common/custom_datablock.py

@@ -10,7 +10,7 @@
 # import the modbus libraries we need
 # --------------------------------------------------------------------------- #
 from __future__ import print_function
-from pymodbus.server.async import StartTcpServer
+from pymodbus.server.asynchronous import StartTcpServer
 from pymodbus.device import ModbusDeviceIdentification
 from pymodbus.datastore import ModbusSparseDataBlock
 from pymodbus.datastore import ModbusSlaveContext, ModbusServerContext

examples/common/dbstore_update_server.py

@@ -16,7 +16,7 @@
 # --------------------------------------------------------------------------- #
 # import the modbus libraries we need
 # --------------------------------------------------------------------------- #
-from pymodbus.server.async import StartTcpServer
+from pymodbus.server.asynchronous import StartTcpServer
 from pymodbus.device import ModbusDeviceIdentification
 from pymodbus.datastore import ModbusSequentialDataBlock
 from pymodbus.datastore import ModbusServerContext

examples/common/synchronous_client.py

@@ -92,7 +92,7 @@ def run_sync_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 = client.write_coil(0, True, unit=UNIT)

examples/common/updating_server.py

@@ -15,7 +15,7 @@
 # --------------------------------------------------------------------------- #
 # import the modbus libraries we need
 # --------------------------------------------------------------------------- #
-from pymodbus.server.async import StartTcpServer
+from pymodbus.server.asynchronous import StartTcpServer
 from pymodbus.device import ModbusDeviceIdentification
 from pymodbus.datastore import ModbusSequentialDataBlock
 from pymodbus.datastore import ModbusSlaveContext, ModbusServerContext

examples/contrib/asynchronous_asyncio_serial_client.py

@@ -2,7 +2,7 @@
 if IS_PYTHON3 and PYTHON_VERSION >= (3, 4):
     import asyncio
     from serial_asyncio import create_serial_connection
-    from pymodbus.client.async.asyncio import ModbusClientProtocol
+    from pymodbus.client.asynchronous.asyncio import ModbusClientProtocol
     from pymodbus.transaction import ModbusAsciiFramer, ModbusRtuFramer
     from pymodbus.factory import ClientDecoder
 else:
@@ -43,7 +43,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/contrib/modbus_scraper.py

@@ -11,7 +11,7 @@
 from pymodbus.datastore import ModbusSequentialDataBlock
 from pymodbus.datastore import ModbusSlaveContext
 from pymodbus.factory import ClientDecoder
-from pymodbus.client.async.twisted import ModbusClientProtocol
+from pymodbus.client.asynchronous.twisted import ModbusClientProtocol
 
 # -------------------------------------------------------------------------- #
 # Configure the client logging

examples/contrib/modbus_simulator.py

@@ -8,7 +8,7 @@
 from optparse import OptionParser
 from twisted.internet import reactor
 
-from pymodbus.server.async import StartTcpServer
+from pymodbus.server.asynchronous import StartTcpServer
 from pymodbus.datastore import ModbusServerContext,ModbusSlaveContext
 
 # -------------------------------------------------------------------------- #

examples/functional/asynchronous_ascii_client.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 import unittest
-from pymodbus.client.async import ModbusSerialClient as ModbusClient
+from pymodbus.client.asynchronous import ModbusSerialClient as ModbusClient
 from base_runner import Runner
 
 class AsynchronousAsciiClient(Runner, unittest.TestCase):

examples/functional/asynchronous_rtu_client.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 import unittest
-from pymodbus.client.async import ModbusSerialClient as ModbusClient
+from pymodbus.client.asynchronous import ModbusSerialClient as ModbusClient
 from base_runner import Runner
 
 class AsynchronousRtuClient(Runner, unittest.TestCase):

examples/functional/asynchronous_tcp_client.py

@@ -2,7 +2,7 @@
 import unittest
 from twisted.internet import reactor, protocol
 from pymodbus.constants import Defaults
-from pymodbus.client.async import ModbusClientProtocol
+from pymodbus.client.asynchronous import ModbusClientProtocol
 from base_runner import Runner
 
 class AsynchronousTcpClient(Runner, unittest.TestCase):