Skip to content

Commit fbbf69e

Browse files
dicesdices
committed
Rebase to dev3.7
1 parent fa724ab commit fbbf69e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+204
-204
lines changed

doc/source/library/pymodbus.client.async.asyncio.rst renamed to doc/source/library/pymodbus.client.asynchronous.asyncio.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
pymodbus\.client\.async\.asyncio package
22
========================================
33

4-
.. automodule:: pymodbus.client.async.asyncio
4+
.. automodule:: pymodbus.client.asynchronous.asyncio
55
:members:
66
:undoc-members:
77
:show-inheritance:

doc/source/library/pymodbus.client.async.factory.rst renamed to doc/source/library/pymodbus.client.asynchronous.factory.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
pymodbus\.client\.async\.factory package
22
========================================
33

4-
.. automodule:: pymodbus.client.async.factory
4+
.. automodule:: pymodbus.client.asynchronous.factory
55
:members:
66
:undoc-members:
77
:show-inheritance:
@@ -12,23 +12,23 @@ Submodules
1212
pymodbus\.client\.async\.factory\.serial module
1313
-----------------------------------------------
1414

15-
.. automodule:: pymodbus.client.async.factory.serial
15+
.. automodule:: pymodbus.client.asynchronous.factory.serial
1616
:members:
1717
:undoc-members:
1818
:show-inheritance:
1919

2020
pymodbus\.client\.async\.factory\.tcp module
2121
--------------------------------------------
2222

23-
.. automodule:: pymodbus.client.async.factory.tcp
23+
.. automodule:: pymodbus.client.asynchronous.factory.tcp
2424
:members:
2525
:undoc-members:
2626
:show-inheritance:
2727

2828
pymodbus\.client\.async\.factory\.udp module
2929
--------------------------------------------
3030

31-
.. automodule:: pymodbus.client.async.factory.udp
31+
.. automodule:: pymodbus.client.asynchronous.factory.udp
3232
:members:
3333
:undoc-members:
3434
:show-inheritance:

doc/source/library/pymodbus.client.async.rst renamed to doc/source/library/pymodbus.client.asynchronous.rst

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
pymodbus\.client\.async package
1+
pymodbus\.client\.asynchronous package
22
===============================
33

4-
.. automodule:: pymodbus.client.async
4+
.. automodule:: pymodbus.client.asynchronous
55
:members:
66
:undoc-members:
77
:show-inheritance:
@@ -11,43 +11,43 @@ Subpackages
1111

1212
.. toctree::
1313

14-
pymodbus.client.async.asyncio
15-
pymodbus.client.async.factory
16-
pymodbus.client.async.schedulers
17-
pymodbus.client.async.tornado
18-
pymodbus.client.async.twisted
14+
pymodbus.client.asynchronous.asyncio
15+
pymodbus.client.asynchronous.factory
16+
pymodbus.client.asynchronous.schedulers
17+
pymodbus.client.asynchronous.tornado
18+
pymodbus.client.asynchronous.twisted
1919

2020
Submodules
2121
----------
2222

2323
pymodbus\.client\.async\.serial module
2424
--------------------------------------
2525

26-
.. automodule:: pymodbus.client.async.serial
26+
.. automodule:: pymodbus.client.asynchronous.serial
2727
:members:
2828
:undoc-members:
2929
:show-inheritance:
3030

3131
pymodbus\.client\.async\.tcp module
3232
-----------------------------------
3333

34-
.. automodule:: pymodbus.client.async.tcp
34+
.. automodule:: pymodbus.client.asynchronous.tcp
3535
:members:
3636
:undoc-members:
3737
:show-inheritance:
3838

3939
pymodbus\.client\.async\.thread module
4040
--------------------------------------
4141

42-
.. automodule:: pymodbus.client.async.thread
42+
.. automodule:: pymodbus.client.asynchronous.thread
4343
:members:
4444
:undoc-members:
4545
:show-inheritance:
4646

4747
pymodbus\.client\.async\.udp module
4848
-----------------------------------
4949

50-
.. automodule:: pymodbus.client.async.udp
50+
.. automodule:: pymodbus.client.asynchronous.udp
5151
:members:
5252
:undoc-members:
5353
:show-inheritance:

doc/source/library/pymodbus.client.async.schedulers.rst renamed to doc/source/library/pymodbus.client.asynchronous.schedulers.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
pymodbus\.client\.async\.schedulers package
22
===========================================
33

4-
.. automodule:: pymodbus.client.async.schedulers
4+
.. automodule:: pymodbus.client.asynchronous.schedulers
55
:members:
66
:undoc-members:
77
:show-inheritance:

doc/source/library/pymodbus.client.async.tornado.rst renamed to doc/source/library/pymodbus.client.asynchronous.tornado.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
pymodbus\.client\.async\.tornado package
22
========================================
33

4-
.. automodule:: pymodbus.client.async.tornado
4+
.. automodule:: pymodbus.client.asynchronous.tornado
55
:members:
66
:undoc-members:
77
:show-inheritance:

doc/source/library/pymodbus.client.async.twisted.rst renamed to doc/source/library/pymodbus.client.asynchronous.twisted.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
pymodbus\.client\.async\.twisted package
22
========================================
33

4-
.. automodule:: pymodbus.client.async.twisted
4+
.. automodule:: pymodbus.client.asynchronous.twisted
55
:members:
66
:undoc-members:
77
:show-inheritance:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Subpackages
1111

1212
.. toctree::
1313

14-
pymodbus.client.async
14+
pymodbus.client.asynchronous
1515

1616
Submodules
1717
----------

‎doc/source/library/pymodbus.server.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ pymodbus\.server package
99
Submodules
1010
----------
1111

12-
pymodbus\.server\.async module
12+
pymodbus\.server\.asynchronous module
1313
------------------------------
1414

15-
.. automodule:: pymodbus.server.async
15+
.. automodule:: pymodbus.server.asynchronous
1616
:members:
1717
:undoc-members:
1818
:show-inheritance:

‎examples/common/async_asyncio_client.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
import asyncio
1414
import logging
1515
# ----------------------------------------------------------------------- #
16-
# Import the required async client
16+
# Import the required asynchronous client
1717
# ----------------------------------------------------------------------- #
18-
from pymodbus.client.async.tcp import AsyncModbusTCPClient as ModbusClient
19-
# from pymodbus.client.async.udp import (
18+
from pymodbus.client.asynchronous.tcp import AsyncModbusTCPClient as ModbusClient
19+
# from pymodbus.client.asynchronous.udp import (
2020
# AsyncModbusUDPClient as ModbusClient)
21-
from pymodbus.client.async import schedulers
21+
from pymodbus.client.asynchronous import schedulers
2222

2323
else:
2424
import sys
@@ -68,7 +68,7 @@ async def start_async_test(client):
6868
# are not known to these tests. Furthermore, some use the same memory
6969
# blocks for the two sets, so a change to one is a change to the other.
7070
# Keep both of these cases in mind when testing as the following will
71-
# _only_ pass with the supplied async modbus server (script supplied).
71+
# _only_ pass with the supplied asynchronous modbus server (script supplied).
7272
# ----------------------------------------------------------------------- #
7373
log.debug("Write to a Coil and read back")
7474
rq = await client.write_coil(0, True, unit=UNIT)

‎examples/common/async_asyncio_serial_client.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
if IS_PYTHON3 and PYTHON_VERSION >= (3, 4):
1313
import logging
1414
import asyncio
15-
from pymodbus.client.async.serial import (
15+
from pymodbus.client.asynchronous.serial import (
1616
AsyncModbusSerialClient as ModbusClient)
17-
from pymodbus.client.async import schedulers
17+
from pymodbus.client.asynchronous import schedulers
1818
else:
1919
import sys
2020
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):
6363
# Furthermore, some use the same memory blocks for the two sets,
6464
# so a change to one is a change to the other.
6565
# Keep both of these cases in mind when testing as the following will
66-
# _only_ pass with the supplied async modbus server (script supplied).
66+
# _only_ pass with the supplied asynchronous modbus server (script supplied).
6767
# ----------------------------------------------------------------------- #
6868
log.debug("Write to a Coil and read back")
6969
rq = await client.write_coil(0, True, unit=UNIT)

0 commit comments

Comments
 (0)