From 0dbea08b8da8aa78bef45e22f0d75bce707b201c Mon Sep 17 00:00:00 2001 From: jan iversen Date: Tue, 30 Dec 2025 12:53:10 +0100 Subject: [PATCH] Use relative import. --- doc/source/library/simulator/config.rst | 4 ++-- .../{pymodbus.crt => pymodbus_tls.crt} | 0 .../{pymodbus.key => pymodbus_tls.key} | 0 examples/helper.py | 2 +- pymodbus/client/__init__.py | 10 +++++----- pymodbus/client/base.py | 14 +++++++------- pymodbus/client/mixin.py | 18 +++++++++--------- pymodbus/client/serial.py | 12 ++++++------ pymodbus/client/tcp.py | 12 ++++++------ pymodbus/client/tls.py | 10 +++++----- pymodbus/client/udp.py | 12 ++++++------ pymodbus/datastore/context.py | 7 +++---- pymodbus/datastore/remote.py | 5 ++--- pymodbus/datastore/sequential.py | 5 +---- pymodbus/datastore/simulator.py | 3 +-- pymodbus/datastore/sparse.py | 5 ++--- pymodbus/datastore/store.py | 2 +- pymodbus/framer/__init__.py | 10 +++++----- pymodbus/framer/ascii.py | 4 ++-- pymodbus/framer/base.py | 6 +++--- pymodbus/framer/rtu.py | 4 ++-- pymodbus/framer/socket.py | 4 ++-- pymodbus/framer/tls.py | 2 +- pymodbus/logging.py | 2 +- pymodbus/pdu/bit_message.py | 5 ++--- pymodbus/pdu/decoders.py | 8 +++----- pymodbus/pdu/device.py | 5 ++--- pymodbus/pdu/diag_message.py | 5 ++--- pymodbus/pdu/events.py | 3 +-- pymodbus/pdu/file_message.py | 5 ++--- pymodbus/pdu/mei_message.py | 5 ++--- pymodbus/pdu/other_message.py | 5 ++--- pymodbus/pdu/pdu.py | 4 ++-- pymodbus/pdu/register_message.py | 7 +++---- pymodbus/server/__init__.py | 10 +++++----- pymodbus/server/base.py | 13 ++++++------- pymodbus/server/requesthandler.py | 12 ++++++------ pymodbus/server/server.py | 11 +++++------ pymodbus/server/simulator/http_server.py | 14 +++++++------- pymodbus/server/simulator/main.py | 5 ++--- pymodbus/server/simulator/setup.json | 4 ++-- pymodbus/server/simulator/web/generator/calls | 2 +- pymodbus/server/simulator/web/generator/log | 2 +- .../server/simulator/web/generator/registers | 2 +- pymodbus/server/simulator/web/generator/server | 2 +- pymodbus/server/simulator/web/index.html | 2 +- .../web/{pymodbus.css => pymodbus_styles.css} | 0 pymodbus/server/simulator/web/welcome.html | 2 +- pymodbus/server/startstop.py | 3 +-- pymodbus/simulator/simdata.py | 4 ++-- pymodbus/transaction/__init__.py | 2 +- pymodbus/transaction/transaction.py | 12 ++++++------ pymodbus/transport/__init__.py | 2 +- pymodbus/transport/transport.py | 4 ++-- test/transport/conftest.py | 4 ++-- 55 files changed, 148 insertions(+), 169 deletions(-) rename examples/certificates/{pymodbus.crt => pymodbus_tls.crt} (100%) rename examples/certificates/{pymodbus.key => pymodbus_tls.key} (100%) rename pymodbus/server/simulator/web/{pymodbus.css => pymodbus_styles.css} (100%) diff --git a/doc/source/library/simulator/config.rst b/doc/source/library/simulator/config.rst index 9cf695f04..ee1f81301 100644 --- a/doc/source/library/simulator/config.rst +++ b/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": { diff --git a/examples/certificates/pymodbus.crt b/examples/certificates/pymodbus_tls.crt similarity index 100% rename from examples/certificates/pymodbus.crt rename to examples/certificates/pymodbus_tls.crt diff --git a/examples/certificates/pymodbus.key b/examples/certificates/pymodbus_tls.key similarity index 100% rename from examples/certificates/pymodbus.key rename to examples/certificates/pymodbus_tls.key diff --git a/examples/helper.py b/examples/helper.py index 971c8c23a..20345192b 100755 --- a/examples/helper.py +++ b/examples/helper.py @@ -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}" diff --git a/pymodbus/client/__init__.py b/pymodbus/client/__init__.py index 8dab11dbb..94c4709ca 100644 --- a/pymodbus/client/__init__.py +++ b/pymodbus/client/__init__.py @@ -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 diff --git a/pymodbus/client/base.py b/pymodbus/client/base.py index 8a28a212e..af09d4a10 100644 --- a/pymodbus/client/base.py +++ b/pymodbus/client/base.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]]): diff --git a/pymodbus/client/mixin.py b/pymodbus/client/mixin.py index ee7ba3fb5..0f9f2e00d 100644 --- a/pymodbus/client/mixin.py +++ b/pymodbus/client/mixin.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) diff --git a/pymodbus/client/serial.py b/pymodbus/client/serial.py index 791781d99..ccd8cf2ae 100644 --- a/pymodbus/client/serial.py +++ b/pymodbus/client/serial.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): diff --git a/pymodbus/client/tcp.py b/pymodbus/client/tcp.py index d45390b7b..d8111f1b2 100644 --- a/pymodbus/client/tcp.py +++ b/pymodbus/client/tcp.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): diff --git a/pymodbus/client/tls.py b/pymodbus/client/tls.py index e4d78c367..058a87a9e 100644 --- a/pymodbus/client/tls.py +++ b/pymodbus/client/tls.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): diff --git a/pymodbus/client/udp.py b/pymodbus/client/udp.py index 7b8740dcf..15f42aac9 100644 --- a/pymodbus/client/udp.py +++ b/pymodbus/client/udp.py @@ -4,12 +4,12 @@ import socket from collections.abc import Callable -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 DGRAM_TYPE = socket.SOCK_DGRAM diff --git a/pymodbus/datastore/context.py b/pymodbus/datastore/context.py index 58491652a..6b439f26f 100644 --- a/pymodbus/datastore/context.py +++ b/pymodbus/datastore/context.py @@ -2,10 +2,9 @@ from __future__ import annotations -from pymodbus.constants import ExcCodes -from pymodbus.exceptions import NoSuchIdException -from pymodbus.logging import Log - +from ..constants import ExcCodes +from ..exceptions import NoSuchIdException +from ..logging import Log from .sequential import ModbusSequentialDataBlock from .store import BaseModbusDataBlock diff --git a/pymodbus/datastore/remote.py b/pymodbus/datastore/remote.py index 17ac1e2bb..ed04eb9bb 100644 --- a/pymodbus/datastore/remote.py +++ b/pymodbus/datastore/remote.py @@ -1,7 +1,6 @@ """Remote datastore.""" -from pymodbus.exceptions import NotImplementedException -from pymodbus.pdu import ExceptionResponse - +from ..exceptions import NotImplementedException +from ..pdu import ExceptionResponse from .context import ModbusBaseDeviceContext diff --git a/pymodbus/datastore/sequential.py b/pymodbus/datastore/sequential.py index c46e15855..7471f43ec 100644 --- a/pymodbus/datastore/sequential.py +++ b/pymodbus/datastore/sequential.py @@ -2,13 +2,10 @@ # pylint: disable=missing-type-doc from __future__ import annotations -from pymodbus.constants import ExcCodes - +from ..constants import ExcCodes from .store import BaseModbusDataBlock -# from pymodbus.pdu.exceptionresponse import ExceptionResponse - class ModbusSequentialDataBlock(BaseModbusDataBlock[list]): """Creates a sequential modbus datastore.""" diff --git a/pymodbus/datastore/simulator.py b/pymodbus/datastore/simulator.py index b453da687..cbba8e297 100644 --- a/pymodbus/datastore/simulator.py +++ b/pymodbus/datastore/simulator.py @@ -8,8 +8,7 @@ from datetime import datetime from typing import Any -from pymodbus.constants import ExcCodes - +from ..constants import ExcCodes from .context import ModbusBaseDeviceContext diff --git a/pymodbus/datastore/sparse.py b/pymodbus/datastore/sparse.py index 3714ebc99..d08e56cb0 100644 --- a/pymodbus/datastore/sparse.py +++ b/pymodbus/datastore/sparse.py @@ -4,9 +4,8 @@ from typing import Any -from pymodbus.constants import ExcCodes -from pymodbus.exceptions import ParameterException - +from ..constants import ExcCodes +from ..exceptions import ParameterException from .store import BaseModbusDataBlock diff --git a/pymodbus/datastore/store.py b/pymodbus/datastore/store.py index 9d6b3e48d..542f65a96 100644 --- a/pymodbus/datastore/store.py +++ b/pymodbus/datastore/store.py @@ -50,7 +50,7 @@ from abc import ABC, abstractmethod from typing import Any, Generic, TypeVar -from pymodbus.constants import ExcCodes +from ..constants import ExcCodes # ---------------------------------------------------------------------------# diff --git a/pymodbus/framer/__init__.py b/pymodbus/framer/__init__.py index 17e7bed8d..39ee0c26f 100644 --- a/pymodbus/framer/__init__.py +++ b/pymodbus/framer/__init__.py @@ -8,11 +8,11 @@ "FramerType" ] -from pymodbus.framer.ascii import FramerAscii -from pymodbus.framer.base import FramerBase, FramerType -from pymodbus.framer.rtu import FramerRTU -from pymodbus.framer.socket import FramerSocket -from pymodbus.framer.tls import FramerTLS +from .ascii import FramerAscii +from .base import FramerBase, FramerType +from .rtu import FramerRTU +from .socket import FramerSocket +from .tls import FramerTLS FRAMER_NAME_TO_CLASS = { diff --git a/pymodbus/framer/ascii.py b/pymodbus/framer/ascii.py index 52111f4c1..552e29b09 100644 --- a/pymodbus/framer/ascii.py +++ b/pymodbus/framer/ascii.py @@ -8,8 +8,8 @@ from binascii import a2b_hex, b2a_hex -from pymodbus.framer.base import FramerBase -from pymodbus.logging import Log +from ..logging import Log +from .base import FramerBase class FramerAscii(FramerBase): diff --git a/pymodbus/framer/base.py b/pymodbus/framer/base.py index a88823847..2d9598432 100644 --- a/pymodbus/framer/base.py +++ b/pymodbus/framer/base.py @@ -8,9 +8,9 @@ from enum import Enum -from pymodbus.exceptions import ModbusIOException -from pymodbus.logging import Log -from pymodbus.pdu import DecodePDU, ModbusPDU +from ..exceptions import ModbusIOException +from ..logging import Log +from ..pdu import DecodePDU, ModbusPDU class FramerType(str, Enum): diff --git a/pymodbus/framer/rtu.py b/pymodbus/framer/rtu.py index 981df6c36..88f2687e1 100644 --- a/pymodbus/framer/rtu.py +++ b/pymodbus/framer/rtu.py @@ -1,8 +1,8 @@ """Modbus RTU frame implementation.""" from __future__ import annotations -from pymodbus.framer.base import FramerBase -from pymodbus.logging import Log +from ..logging import Log +from .base import FramerBase class FramerRTU(FramerBase): diff --git a/pymodbus/framer/socket.py b/pymodbus/framer/socket.py index 8476c6876..980c12852 100644 --- a/pymodbus/framer/socket.py +++ b/pymodbus/framer/socket.py @@ -1,8 +1,8 @@ """Modbus Socket frame implementation.""" from __future__ import annotations -from pymodbus.framer.base import FramerBase -from pymodbus.logging import Log +from ..logging import Log +from .base import FramerBase class FramerSocket(FramerBase): diff --git a/pymodbus/framer/tls.py b/pymodbus/framer/tls.py index a805d883d..3f77c3fdb 100644 --- a/pymodbus/framer/tls.py +++ b/pymodbus/framer/tls.py @@ -1,7 +1,7 @@ """Modbus TLS frame implementation.""" from __future__ import annotations -from pymodbus.framer.base import FramerBase +from .base import FramerBase class FramerTLS(FramerBase): diff --git a/pymodbus/logging.py b/pymodbus/logging.py index 281226b56..58ee302c6 100644 --- a/pymodbus/logging.py +++ b/pymodbus/logging.py @@ -8,7 +8,7 @@ from binascii import b2a_hex from logging import NullHandler as __null -from pymodbus.utilities import hexlify_packets +from .utilities import hexlify_packets # ---------------------------------------------------------------------------# diff --git a/pymodbus/pdu/bit_message.py b/pymodbus/pdu/bit_message.py index 55ee41903..c82f9dc96 100644 --- a/pymodbus/pdu/bit_message.py +++ b/pymodbus/pdu/bit_message.py @@ -3,9 +3,8 @@ import struct from typing import cast -from pymodbus.constants import ExcCodes, ModbusStatus -from pymodbus.datastore import ModbusDeviceContext - +from ..constants import ExcCodes, ModbusStatus +from ..datastore import ModbusDeviceContext from .decoders import DecodePDU from .exceptionresponse import ExceptionResponse from .pdu import ModbusPDU, pack_bitstring, unpack_bitstring diff --git a/pymodbus/pdu/decoders.py b/pymodbus/pdu/decoders.py index ecf1cf93e..c399749a1 100644 --- a/pymodbus/pdu/decoders.py +++ b/pymodbus/pdu/decoders.py @@ -3,9 +3,8 @@ import copy -from pymodbus.exceptions import MessageRegisterException, ModbusException -from pymodbus.logging import Log - +from ..exceptions import MessageRegisterException, ModbusException +from ..logging import Log from .exceptionresponse import ExceptionResponse from .pdu import ModbusPDU @@ -52,8 +51,7 @@ def register(self, custom_class: type[ModbusPDU]) -> None: if not issubclass(custom_class, ModbusPDU): raise MessageRegisterException( f'"{custom_class.__class__.__name__}" is Not a valid Modbus Message' - ". Class needs to be derived from " - "`pymodbus.pdu.ModbusPDU` " + ". Class needs to be derived from `ModbusPDU` " ) if "pdu_table" not in self.__dict__: self.pdu_table = copy.deepcopy(DecodePDU.pdu_table) diff --git a/pymodbus/pdu/device.py b/pymodbus/pdu/device.py index 6fc0acf1c..fae50a229 100644 --- a/pymodbus/pdu/device.py +++ b/pymodbus/pdu/device.py @@ -16,9 +16,8 @@ import struct # pylint: disable=missing-type-doc -from pymodbus.constants import DeviceInformation -from pymodbus.utilities import dict_property - +from ..constants import DeviceInformation +from ..utilities import dict_property from .events import ModbusEvent diff --git a/pymodbus/pdu/diag_message.py b/pymodbus/pdu/diag_message.py index fddedbc6b..9681039c5 100644 --- a/pymodbus/pdu/diag_message.py +++ b/pymodbus/pdu/diag_message.py @@ -4,9 +4,8 @@ import struct from typing import cast -from pymodbus.constants import ModbusPlusOperation -from pymodbus.datastore import ModbusDeviceContext - +from ..constants import ModbusPlusOperation +from ..datastore import ModbusDeviceContext from .decoders import DecodePDU from .device import ModbusControlBlock from .pdu import ModbusPDU, pack_bitstring diff --git a/pymodbus/pdu/events.py b/pymodbus/pdu/events.py index 92fe1598f..cc971e2e1 100644 --- a/pymodbus/pdu/events.py +++ b/pymodbus/pdu/events.py @@ -7,8 +7,7 @@ # pylint: disable=missing-type-doc from abc import ABC, abstractmethod -from pymodbus.exceptions import ParameterException - +from ..exceptions import ParameterException from .pdu import pack_bitstring, unpack_bitstring diff --git a/pymodbus/pdu/file_message.py b/pymodbus/pdu/file_message.py index 4c381763b..2aedc0fba 100644 --- a/pymodbus/pdu/file_message.py +++ b/pymodbus/pdu/file_message.py @@ -4,9 +4,8 @@ import struct from dataclasses import dataclass -from pymodbus.datastore import ModbusDeviceContext -from pymodbus.exceptions import ModbusException - +from ..datastore import ModbusDeviceContext +from ..exceptions import ModbusException from .decoders import DecodePDU from .pdu import ModbusPDU diff --git a/pymodbus/pdu/mei_message.py b/pymodbus/pdu/mei_message.py index d77e217c9..fc04782f9 100644 --- a/pymodbus/pdu/mei_message.py +++ b/pymodbus/pdu/mei_message.py @@ -4,9 +4,8 @@ import struct from typing import Any -from pymodbus.constants import DeviceInformation, ExcCodes, MoreData -from pymodbus.datastore import ModbusDeviceContext - +from ..constants import DeviceInformation, ExcCodes, MoreData +from ..datastore import ModbusDeviceContext from .decoders import DecodePDU from .device import DeviceInformationFactory, ModbusControlBlock from .exceptionresponse import ExceptionResponse diff --git a/pymodbus/pdu/other_message.py b/pymodbus/pdu/other_message.py index 283a7f138..bf2ffe422 100644 --- a/pymodbus/pdu/other_message.py +++ b/pymodbus/pdu/other_message.py @@ -3,9 +3,8 @@ import struct -from pymodbus.constants import ModbusStatus -from pymodbus.datastore import ModbusDeviceContext - +from ..constants import ModbusStatus +from ..datastore import ModbusDeviceContext from .decoders import DecodePDU from .device import DeviceInformationFactory, ModbusControlBlock from .pdu import ModbusPDU diff --git a/pymodbus/pdu/pdu.py b/pymodbus/pdu/pdu.py index 038ea5666..4bfd0609c 100644 --- a/pymodbus/pdu/pdu.py +++ b/pymodbus/pdu/pdu.py @@ -5,8 +5,8 @@ import struct from abc import abstractmethod -from pymodbus.datastore import ModbusDeviceContext -from pymodbus.exceptions import ModbusIOException, NotImplementedException +from ..datastore import ModbusDeviceContext +from ..exceptions import ModbusIOException, NotImplementedException class ModbusPDU: diff --git a/pymodbus/pdu/register_message.py b/pymodbus/pdu/register_message.py index e576de233..f47f31615 100644 --- a/pymodbus/pdu/register_message.py +++ b/pymodbus/pdu/register_message.py @@ -6,10 +6,9 @@ from collections.abc import Sequence from typing import cast -from pymodbus.constants import ExcCodes -from pymodbus.datastore import ModbusDeviceContext -from pymodbus.exceptions import ModbusIOException - +from ..constants import ExcCodes +from ..datastore import ModbusDeviceContext +from ..exceptions import ModbusIOException from .decoders import DecodePDU from .exceptionresponse import ExceptionResponse from .pdu import ModbusPDU diff --git a/pymodbus/server/__init__.py b/pymodbus/server/__init__.py index 802d362bb..32de40e18 100644 --- a/pymodbus/server/__init__.py +++ b/pymodbus/server/__init__.py @@ -20,16 +20,16 @@ "get_simulator_commandline", ] -from pymodbus.server.base import ModbusBaseServer -from pymodbus.server.server import ( +from .base import ModbusBaseServer +from .server import ( ModbusSerialServer, ModbusTcpServer, ModbusTlsServer, ModbusUdpServer, ) -from pymodbus.server.simulator.http_server import ModbusSimulatorServer -from pymodbus.server.simulator.main import get_commandline as get_simulator_commandline -from pymodbus.server.startstop import ( +from .simulator.http_server import ModbusSimulatorServer +from .simulator.main import get_commandline as get_simulator_commandline +from .startstop import ( ServerAsyncStop, ServerStop, StartAsyncSerialServer, diff --git a/pymodbus/server/base.py b/pymodbus/server/base.py index 480ba8e2a..e3f560749 100644 --- a/pymodbus/server/base.py +++ b/pymodbus/server/base.py @@ -5,13 +5,12 @@ from collections.abc import Callable from contextlib import suppress -from pymodbus.datastore import ModbusServerContext -from pymodbus.framer import FRAMER_NAME_TO_CLASS, FramerType -from pymodbus.logging import Log -from pymodbus.pdu import DecodePDU, ModbusPDU -from pymodbus.pdu.device import ModbusControlBlock, ModbusDeviceIdentification -from pymodbus.transport import CommParams, ModbusProtocol - +from ..datastore import ModbusServerContext +from ..framer import FRAMER_NAME_TO_CLASS, FramerType +from ..logging import Log +from ..pdu import DecodePDU, ModbusPDU +from ..pdu.device import ModbusControlBlock, ModbusDeviceIdentification +from ..transport import CommParams, ModbusProtocol from .requesthandler import ServerRequestHandler diff --git a/pymodbus/server/requesthandler.py b/pymodbus/server/requesthandler.py index 53de04c49..4a02e1418 100644 --- a/pymodbus/server/requesthandler.py +++ b/pymodbus/server/requesthandler.py @@ -4,12 +4,12 @@ import asyncio import traceback -from pymodbus.constants import ExcCodes -from pymodbus.exceptions import ModbusIOException, NoSuchIdException -from pymodbus.logging import Log -from pymodbus.pdu import ExceptionResponse -from pymodbus.transaction import TransactionManager -from pymodbus.transport import CommParams +from ..constants import ExcCodes +from ..exceptions import ModbusIOException, NoSuchIdException +from ..logging import Log +from ..pdu import ExceptionResponse +from ..transaction import TransactionManager +from ..transport import CommParams class ServerRequestHandler(TransactionManager): diff --git a/pymodbus/server/server.py b/pymodbus/server/server.py index 8fbd16738..a966b6912 100644 --- a/pymodbus/server/server.py +++ b/pymodbus/server/server.py @@ -3,12 +3,11 @@ from collections.abc import Callable -from pymodbus.datastore import ModbusServerContext -from pymodbus.framer import FramerType -from pymodbus.pdu import ModbusPDU -from pymodbus.pdu.device import ModbusDeviceIdentification -from pymodbus.transport import CommParams, CommType - +from ..datastore import ModbusServerContext +from ..framer import FramerType +from ..pdu import ModbusPDU +from ..pdu.device import ModbusDeviceIdentification +from ..transport import CommParams, CommType from .base import ModbusBaseServer diff --git a/pymodbus/server/simulator/http_server.py b/pymodbus/server/simulator/http_server.py index 7c438bcbd..1e9a38041 100644 --- a/pymodbus/server/simulator/http_server.py +++ b/pymodbus/server/simulator/http_server.py @@ -13,12 +13,12 @@ with contextlib.suppress(ImportError): from aiohttp import web -from pymodbus.datastore import ModbusServerContext, ModbusSimulatorContext -from pymodbus.datastore.simulator import Label -from pymodbus.logging import Log -from pymodbus.pdu import DecodePDU -from pymodbus.pdu.device import ModbusDeviceIdentification -from pymodbus.server.server import ( +from ...datastore import ModbusServerContext, ModbusSimulatorContext +from ...datastore.simulator import Label +from ...logging import Log +from ...pdu import DecodePDU +from ...pdu.device import ModbusDeviceIdentification +from ..server import ( ModbusSerialServer, ModbusTcpServer, ModbusTlsServer, @@ -96,7 +96,7 @@ class ModbusSimulatorServer: Example:: - from pymodbus.server import ModbusSimulatorServer + from pymodbus import ModbusSimulatorServer async def run(): simulator = ModbusSimulatorServer( diff --git a/pymodbus/server/simulator/main.py b/pymodbus/server/simulator/main.py index 3ecade4a7..5b603e79b 100755 --- a/pymodbus/server/simulator/main.py +++ b/pymodbus/server/simulator/main.py @@ -43,9 +43,8 @@ import asyncio import os -from pymodbus import pymodbus_apply_logging_config -from pymodbus.logging import Log -from pymodbus.server.simulator.http_server import ModbusSimulatorServer +from ...logging import Log, pymodbus_apply_logging_config +from .http_server import ModbusSimulatorServer def get_commandline(cmdline=None): diff --git a/pymodbus/server/simulator/setup.json b/pymodbus/server/simulator/setup.json index ef41ff6f7..a9f888568 100644 --- a/pymodbus/server/simulator/setup.json +++ b/pymodbus/server/simulator/setup.json @@ -38,8 +38,8 @@ "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": { diff --git a/pymodbus/server/simulator/web/generator/calls b/pymodbus/server/simulator/web/generator/calls index d12c50ff5..2bdc947ca 100644 --- a/pymodbus/server/simulator/web/generator/calls +++ b/pymodbus/server/simulator/web/generator/calls @@ -7,7 +7,7 @@ - + diff --git a/pymodbus/server/simulator/web/generator/log b/pymodbus/server/simulator/web/generator/log index db903a5ca..56b21cce0 100644 --- a/pymodbus/server/simulator/web/generator/log +++ b/pymodbus/server/simulator/web/generator/log @@ -7,7 +7,7 @@ - + diff --git a/pymodbus/server/simulator/web/generator/registers b/pymodbus/server/simulator/web/generator/registers index be147550a..fc848699e 100644 --- a/pymodbus/server/simulator/web/generator/registers +++ b/pymodbus/server/simulator/web/generator/registers @@ -7,7 +7,7 @@ - + diff --git a/pymodbus/server/simulator/web/generator/server b/pymodbus/server/simulator/web/generator/server index b628e7874..7336cdd57 100644 --- a/pymodbus/server/simulator/web/generator/server +++ b/pymodbus/server/simulator/web/generator/server @@ -7,7 +7,7 @@ - + diff --git a/pymodbus/server/simulator/web/index.html b/pymodbus/server/simulator/web/index.html index f0984420c..ff7ab18b8 100644 --- a/pymodbus/server/simulator/web/index.html +++ b/pymodbus/server/simulator/web/index.html @@ -7,7 +7,7 @@ - +