Use relative import. (#2836)

Author: janiversen

doc/source/library/simulator/config.rst

@@ -121,8 +121,8 @@ Server configuration examples
                 "comm": "tls",
                 "host": "0.0.0.0",
                 "port": 5020,
-                "certfile": "certificates/pymodbus.crt",
-                "keyfile": "certificates/pymodbus.key",
+                "certfile": "certificates/pymodbus_tls.crt",
+                "keyfile": "certificates/pymodbus_tls.key",
                 "ignore_missing_devices": false,
                 "framer": "tls",
                 "identity": {

examples/certificates/pymodbus.crt examples/certificates/pymodbus_tls.crtexamples/certificates/pymodbus.crt renamed to examples/certificates/pymodbus_tls.crt

@@ -130,4 +130,4 @@ def get_certificate(suffix: str):
         path = "examples"
     else:
         raise RuntimeError(f"**Error** Cannot find certificate path={cwd}")
-    return f"{path}/certificates/pymodbus.{suffix}"
+    return f"{path}/certificates/pymodbus_tls.{suffix}"

examples/certificates/pymodbus.key examples/certificates/pymodbus_tls.keyexamples/certificates/pymodbus.key renamed to examples/certificates/pymodbus_tls.key

@@ -13,8 +13,8 @@
     "ModbusUdpClient",
 ]
 
-from pymodbus.client.base import ModbusBaseClient, ModbusBaseSyncClient
-from pymodbus.client.serial import AsyncModbusSerialClient, ModbusSerialClient
-from pymodbus.client.tcp import AsyncModbusTcpClient, ModbusTcpClient
-from pymodbus.client.tls import AsyncModbusTlsClient, ModbusTlsClient
-from pymodbus.client.udp import AsyncModbusUdpClient, ModbusUdpClient
+from .base import ModbusBaseClient, ModbusBaseSyncClient
+from .serial import AsyncModbusSerialClient, ModbusSerialClient
+from .tcp import AsyncModbusTcpClient, ModbusTcpClient
+from .tls import AsyncModbusTlsClient, ModbusTlsClient
+from .udp import AsyncModbusUdpClient, ModbusUdpClient

examples/helper.py

@@ -5,13 +5,13 @@
 from abc import abstractmethod
 from collections.abc import Awaitable, Callable
 
-from pymodbus.client.mixin import ModbusClientMixin
-from pymodbus.exceptions import ConnectionException
-from pymodbus.framer import FRAMER_NAME_TO_CLASS, FramerBase, FramerType
-from pymodbus.logging import Log
-from pymodbus.pdu import DecodePDU, ModbusPDU
-from pymodbus.transaction import TransactionManager
-from pymodbus.transport import CommParams
+from ..exceptions import ConnectionException
+from ..framer import FRAMER_NAME_TO_CLASS, FramerBase, FramerType
+from ..logging import Log
+from ..pdu import DecodePDU, ModbusPDU
+from ..transaction import TransactionManager
+from ..transport import CommParams
+from .mixin import ModbusClientMixin
 
 
 class ModbusBaseClient(ModbusClientMixin[Awaitable[ModbusPDU]]):

pymodbus/client/__init__.py

@@ -6,15 +6,15 @@
 from abc import abstractmethod
 from typing import Generic, Literal, TypeVar, cast
 
-import pymodbus.pdu.bit_message as pdu_bit
-import pymodbus.pdu.diag_message as pdu_diag
-import pymodbus.pdu.file_message as pdu_file_msg
-import pymodbus.pdu.mei_message as pdu_mei
-import pymodbus.pdu.other_message as pdu_other_msg
-import pymodbus.pdu.register_message as pdu_reg
-from pymodbus.constants import ModbusStatus
-from pymodbus.exceptions import ModbusException
-from pymodbus.pdu.pdu import ModbusPDU, pack_bitstring, unpack_bitstring
+from ..constants import ModbusStatus
+from ..exceptions import ModbusException
+from ..pdu import bit_message as pdu_bit
+from ..pdu import diag_message as pdu_diag
+from ..pdu import file_message as pdu_file_msg
+from ..pdu import mei_message as pdu_mei
+from ..pdu import other_message as pdu_other_msg
+from ..pdu import register_message as pdu_reg
+from ..pdu.pdu import ModbusPDU, pack_bitstring, unpack_bitstring
 
 
 T = TypeVar("T", covariant=False)

pymodbus/client/base.py

@@ -7,12 +7,12 @@
 from collections.abc import Callable
 from functools import partial
 
-from pymodbus.client.base import ModbusBaseClient, ModbusBaseSyncClient
-from pymodbus.exceptions import ConnectionException
-from pymodbus.framer import FramerType
-from pymodbus.logging import Log
-from pymodbus.pdu import ModbusPDU
-from pymodbus.transport import CommParams, CommType
+from ..exceptions import ConnectionException
+from ..framer import FramerType
+from ..logging import Log
+from ..pdu import ModbusPDU
+from ..transport import CommParams, CommType
+from .base import ModbusBaseClient, ModbusBaseSyncClient
 
 
 with contextlib.suppress(ImportError):

pymodbus/client/mixin.py

@@ -7,12 +7,12 @@
 from collections.abc import Callable
 from ssl import SSLWantReadError
 
-from pymodbus.client.base import ModbusBaseClient, ModbusBaseSyncClient
-from pymodbus.exceptions import ConnectionException
-from pymodbus.framer import FramerType
-from pymodbus.logging import Log
-from pymodbus.pdu import ModbusPDU
-from pymodbus.transport import CommParams, CommType
+from ..exceptions import ConnectionException
+from ..framer import FramerType
+from ..logging import Log
+from ..pdu import ModbusPDU
+from ..transport import CommParams, CommType
+from .base import ModbusBaseClient, ModbusBaseSyncClient
 
 
 class AsyncModbusTcpClient(ModbusBaseClient):

pymodbus/client/serial.py

@@ -5,11 +5,11 @@
 import ssl
 from collections.abc import Callable
 
-from pymodbus.client.tcp import AsyncModbusTcpClient, ModbusTcpClient
-from pymodbus.framer import FramerType
-from pymodbus.logging import Log
-from pymodbus.pdu import ModbusPDU
-from pymodbus.transport import CommParams, CommType
+from ..framer import FramerType
+from ..logging import Log
+from ..pdu import ModbusPDU
+from ..transport import CommParams, CommType
+from .tcp import AsyncModbusTcpClient, ModbusTcpClient
 
 
 class AsyncModbusTlsClient(AsyncModbusTcpClient):