diff --git a/examples/build_bcd_payload.py b/examples/build_bcd_payload.py index 9648977ba..67a626f01 100644 --- a/examples/build_bcd_payload.py +++ b/examples/build_bcd_payload.py @@ -4,6 +4,7 @@ that can be used in the pymodbus library. Below is a simple binary coded decimal builder and decoder. """ + from struct import pack from pymodbus.constants import Endian @@ -219,9 +220,3 @@ def decode_string(self, size: int = 1): if __name__ == "__main__": print("Test") - -# --------------------------------------------------------------------------- # -# Exported Identifiers -# --------------------------------------------------------------------------- # - -__all__ = ["BcdPayloadBuilder", "BcdPayloadDecoder"] diff --git a/pymodbus/__init__.py b/pymodbus/__init__.py index c8a453346..980d1e274 100644 --- a/pymodbus/__init__.py +++ b/pymodbus/__init__.py @@ -1,21 +1,17 @@ """Pymodbus: Modbus Protocol Implementation. -Released under the the BSD license +Released under the BSD license """ +__all__ = [ + "pymodbus_apply_logging_config", + "__version__", + "__version_full__", +] + from pymodbus.logging import pymodbus_apply_logging_config from pymodbus.version import version __version__ = version.short() __version_full__ = str(version) - -# --------------------------------------------------------------------------- # -# Exported symbols -# --------------------------------------------------------------------------- # - -__all__ = [ - "pymodbus_apply_logging_config", - "__version__", - "__version_full__", -] diff --git a/pymodbus/bit_read_message.py b/pymodbus/bit_read_message.py index 84260207f..92876a172 100644 --- a/pymodbus/bit_read_message.py +++ b/pymodbus/bit_read_message.py @@ -1,4 +1,13 @@ """Bit Reading Request/Response messages.""" + +__all__ = [ + "ReadBitsResponseBase", + "ReadCoilsRequest", + "ReadCoilsResponse", + "ReadDiscreteInputsRequest", + "ReadDiscreteInputsResponse", +] + # pylint: disable=missing-type-doc import struct @@ -256,15 +265,3 @@ def __init__(self, values=None, slave=Defaults.Slave, **kwargs): :param slave: Modbus slave slave ID """ ReadBitsResponseBase.__init__(self, values, slave, **kwargs) - - -# ---------------------------------------------------------------------------# -# Exported symbols -# ---------------------------------------------------------------------------# -__all__ = [ - "ReadBitsResponseBase", - "ReadCoilsRequest", - "ReadCoilsResponse", - "ReadDiscreteInputsRequest", - "ReadDiscreteInputsResponse", -] diff --git a/pymodbus/bit_write_message.py b/pymodbus/bit_write_message.py index 800910443..5f5a71ad5 100644 --- a/pymodbus/bit_write_message.py +++ b/pymodbus/bit_write_message.py @@ -2,6 +2,14 @@ TODO write mask request/response """ + +__all__ = [ + "WriteSingleCoilRequest", + "WriteSingleCoilResponse", + "WriteMultipleCoilsRequest", + "WriteMultipleCoilsResponse", +] + # pylint: disable=missing-type-doc import struct @@ -276,14 +284,3 @@ def __str__(self): :returns: A string representation of the instance """ return f"WriteNCoilResponse({self.address}, {self.count})" - - -# ---------------------------------------------------------------------------# -# Exported symbols -# ---------------------------------------------------------------------------# -__all__ = [ - "WriteSingleCoilRequest", - "WriteSingleCoilResponse", - "WriteMultipleCoilsRequest", - "WriteMultipleCoilsResponse", -] diff --git a/pymodbus/client/__init__.py b/pymodbus/client/__init__.py index 1d23fd39e..e9964c3dd 100644 --- a/pymodbus/client/__init__.py +++ b/pymodbus/client/__init__.py @@ -1,14 +1,5 @@ """Client""" -from pymodbus.client.base import ModbusBaseClient -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 - -# ---------------------------------------------------------------------------# -# Exported symbols -# ---------------------------------------------------------------------------# __all__ = [ "AsyncModbusSerialClient", "AsyncModbusTcpClient", @@ -20,3 +11,9 @@ "ModbusTlsClient", "ModbusUdpClient", ] + +from pymodbus.client.base import ModbusBaseClient +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 diff --git a/pymodbus/client/sync_diag.py b/pymodbus/client/sync_diag.py index 823784788..6e2694fd4 100644 --- a/pymodbus/client/sync_diag.py +++ b/pymodbus/client/sync_diag.py @@ -1,4 +1,10 @@ """Sync diag.""" + +__all__ = [ + "ModbusTcpDiagClient", + "get_client", +] + import socket import time @@ -160,10 +166,3 @@ def get_client(): :returns: ModbusTcpClient or a child class thereof """ return ModbusTcpDiagClient - - -# --------------------------------------------------------------------------- # -# Exported symbols -# --------------------------------------------------------------------------- # - -__all__ = ["ModbusTcpDiagClient", "get_client"] diff --git a/pymodbus/constants.py b/pymodbus/constants.py index 157f57379..781e61906 100644 --- a/pymodbus/constants.py +++ b/pymodbus/constants.py @@ -307,16 +307,3 @@ class MoreData: # pylint: disable=too-few-public-methods def __init__(self): """Prohibit objects.""" raise RuntimeError(INTERNAL_ERROR) - - -# ---------------------------------------------------------------------------# -# Exported Identifiers -# ---------------------------------------------------------------------------# -__all__ = [ - "Defaults", - "ModbusStatus", - "Endian", - "ModbusPlusOperation", - "DeviceInformation", - "MoreData", -] diff --git a/pymodbus/datastore/__init__.py b/pymodbus/datastore/__init__.py index 8842135cb..e66600d7d 100644 --- a/pymodbus/datastore/__init__.py +++ b/pymodbus/datastore/__init__.py @@ -1,4 +1,14 @@ """Datastore.""" + +__all__ = [ + "ModbusBaseSlaveContext", + "ModbusSequentialDataBlock", + "ModbusSparseDataBlock", + "ModbusSlaveContext", + "ModbusServerContext", + "ModbusSimulatorContext", +] + from pymodbus.datastore.context import ( ModbusBaseSlaveContext, ModbusServerContext, @@ -9,16 +19,3 @@ ModbusSequentialDataBlock, ModbusSparseDataBlock, ) - - -# ---------------------------------------------------------------------------# -# Exported symbols -# ---------------------------------------------------------------------------# -__all__ = [ - "ModbusBaseSlaveContext", - "ModbusSequentialDataBlock", - "ModbusSparseDataBlock", - "ModbusSlaveContext", - "ModbusServerContext", - "ModbusSimulatorContext", -] diff --git a/pymodbus/device.py b/pymodbus/device.py index dabf81529..cf1dc7103 100644 --- a/pymodbus/device.py +++ b/pymodbus/device.py @@ -4,6 +4,13 @@ maintained in the server context and the various methods should be inserted in the correct locations. """ + +__all__ = [ + "ModbusPlusStatistics", + "ModbusDeviceIdentification", + "DeviceInformationFactory", +] + import struct # pylint: disable=missing-type-doc @@ -599,14 +606,3 @@ def getDiagnosticRegister(self): :returns: The diagnostic register collection """ return self.__diagnostic - - -# ---------------------------------------------------------------------------# -# Exported Identifiers -# ---------------------------------------------------------------------------# -__all__ = [ - "ModbusPlusStatistics", - "ModbusDeviceIdentification", - "DeviceInformationFactory", - "ModbusControlBlock", -] diff --git a/pymodbus/diag_message.py b/pymodbus/diag_message.py index 27cee8b8f..459189ad2 100644 --- a/pymodbus/diag_message.py +++ b/pymodbus/diag_message.py @@ -3,6 +3,46 @@ These need to be tied into a the current server context or linked to the appropriate data """ + +__all__ = [ + "DiagnosticStatusRequest", + "DiagnosticStatusResponse", + "ReturnQueryDataRequest", + "ReturnQueryDataResponse", + "RestartCommunicationsOptionRequest", + "RestartCommunicationsOptionResponse", + "ReturnDiagnosticRegisterRequest", + "ReturnDiagnosticRegisterResponse", + "ChangeAsciiInputDelimiterRequest", + "ChangeAsciiInputDelimiterResponse", + "ForceListenOnlyModeRequest", + "ForceListenOnlyModeResponse", + "ClearCountersRequest", + "ClearCountersResponse", + "ReturnBusMessageCountRequest", + "ReturnBusMessageCountResponse", + "ReturnBusCommunicationErrorCountRequest", + "ReturnBusCommunicationErrorCountResponse", + "ReturnBusExceptionErrorCountRequest", + "ReturnBusExceptionErrorCountResponse", + "ReturnSlaveMessageCountRequest", + "ReturnSlaveMessageCountResponse", + "ReturnSlaveNoResponseCountRequest", + "ReturnSlaveNoResponseCountResponse", + "ReturnSlaveNAKCountRequest", + "ReturnSlaveNAKCountResponse", + "ReturnSlaveBusyCountRequest", + "ReturnSlaveBusyCountResponse", + "ReturnSlaveBusCharacterOverrunCountRequest", + "ReturnSlaveBusCharacterOverrunCountResponse", + "ReturnIopOverrunCountRequest", + "ReturnIopOverrunCountResponse", + "ClearOverrunCountRequest", + "ClearOverrunCountResponse", + "GetClearModbusPlusRequest", + "GetClearModbusPlusResponse", +] + # pylint: disable=missing-type-doc import struct @@ -826,46 +866,3 @@ class GetClearModbusPlusResponse(DiagnosticStatusSimpleResponse): """ sub_function_code = 0x0015 - - -# ---------------------------------------------------------------------------# -# Exported symbols -# ---------------------------------------------------------------------------# -__all__ = [ - "DiagnosticStatusRequest", - "DiagnosticStatusResponse", - "ReturnQueryDataRequest", - "ReturnQueryDataResponse", - "RestartCommunicationsOptionRequest", - "RestartCommunicationsOptionResponse", - "ReturnDiagnosticRegisterRequest", - "ReturnDiagnosticRegisterResponse", - "ChangeAsciiInputDelimiterRequest", - "ChangeAsciiInputDelimiterResponse", - "ForceListenOnlyModeRequest", - "ForceListenOnlyModeResponse", - "ClearCountersRequest", - "ClearCountersResponse", - "ReturnBusMessageCountRequest", - "ReturnBusMessageCountResponse", - "ReturnBusCommunicationErrorCountRequest", - "ReturnBusCommunicationErrorCountResponse", - "ReturnBusExceptionErrorCountRequest", - "ReturnBusExceptionErrorCountResponse", - "ReturnSlaveMessageCountRequest", - "ReturnSlaveMessageCountResponse", - "ReturnSlaveNoResponseCountRequest", - "ReturnSlaveNoResponseCountResponse", - "ReturnSlaveNAKCountRequest", - "ReturnSlaveNAKCountResponse", - "ReturnSlaveBusyCountRequest", - "ReturnSlaveBusyCountResponse", - "ReturnSlaveBusCharacterOverrunCountRequest", - "ReturnSlaveBusCharacterOverrunCountResponse", - "ReturnIopOverrunCountRequest", - "ReturnIopOverrunCountResponse", - "ClearOverrunCountRequest", - "ClearOverrunCountResponse", - "GetClearModbusPlusRequest", - "GetClearModbusPlusResponse", -] diff --git a/pymodbus/exceptions.py b/pymodbus/exceptions.py index eee86139f..efc276a22 100644 --- a/pymodbus/exceptions.py +++ b/pymodbus/exceptions.py @@ -3,6 +3,17 @@ Custom exceptions to be used in the Modbus code. """ +__all__ = [ + "ModbusException", + "ModbusIOException", + "ParameterException", + "NotImplementedException", + "ConnectionException", + "NoSuchSlaveException", + "InvalidMessageReceivedException", + "MessageRegisterException", +] + class ModbusException(Exception): """Base modbus exception.""" @@ -104,18 +115,3 @@ def __init__(self, string=""): """Initialize.""" message = f"[Error registering message] {string}" ModbusException.__init__(self, message) - - -# --------------------------------------------------------------------------- # -# Exported symbols -# --------------------------------------------------------------------------- # -__all__ = [ - "ModbusException", - "ModbusIOException", - "ParameterException", - "NotImplementedException", - "ConnectionException", - "NoSuchSlaveException", - "InvalidMessageReceivedException", - "MessageRegisterException", -] diff --git a/pymodbus/factory.py b/pymodbus/factory.py index 1c03144ca..e8d6b46dc 100644 --- a/pymodbus/factory.py +++ b/pymodbus/factory.py @@ -8,6 +8,7 @@ Regardless of how many functions are added to the lookup, O(1) behavior is kept as a result of a pre-computed lookup dictionary. """ + # pylint: disable=missing-type-doc from pymodbus.bit_read_message import ( ReadCoilsRequest, @@ -367,11 +368,3 @@ def register(self, function): self.__sub_lookup[function.function_code][ function.sub_function_code ] = function - - -# --------------------------------------------------------------------------- # -# Exported symbols -# --------------------------------------------------------------------------- # - - -__all__ = ["ServerDecoder", "ClientDecoder"] diff --git a/pymodbus/file_message.py b/pymodbus/file_message.py index aacab7918..45e2fdc90 100644 --- a/pymodbus/file_message.py +++ b/pymodbus/file_message.py @@ -2,6 +2,17 @@ Currently none of these messages are implemented """ + +__all__ = [ + "FileRecord", + "ReadFileRecordRequest", + "ReadFileRecordResponse", + "WriteFileRecordRequest", + "WriteFileRecordResponse", + "ReadFifoQueueRequest", + "ReadFifoQueueResponse", +] + # pylint: disable=missing-type-doc import struct @@ -424,17 +435,3 @@ def decode(self, data): for index in range(0, count - 4): idx = 4 + index * 2 self.values.append(struct.unpack(">H", data[idx : idx + 2])[0]) - - -# ---------------------------------------------------------------------------# -# Exported symbols -# ---------------------------------------------------------------------------# -__all__ = [ - "FileRecord", - "ReadFileRecordRequest", - "ReadFileRecordResponse", - "WriteFileRecordRequest", - "WriteFileRecordResponse", - "ReadFifoQueueRequest", - "ReadFifoQueueResponse", -] diff --git a/pymodbus/mei_message.py b/pymodbus/mei_message.py index 0b44fb97b..06151f1ae 100644 --- a/pymodbus/mei_message.py +++ b/pymodbus/mei_message.py @@ -1,4 +1,10 @@ """Encapsulated Interface (MEI) Transport Messages.""" + +__all__ = [ + "ReadDeviceInformationRequest", + "ReadDeviceInformationResponse", +] + # pylint: disable=missing-type-doc import struct @@ -210,12 +216,3 @@ def __str__(self): :returns: The string representation of the response """ return f"ReadDeviceInformationResponse({self.read_code})" - - -# ---------------------------------------------------------------------------# -# Exported symbols -# ---------------------------------------------------------------------------# -__all__ = [ - "ReadDeviceInformationRequest", - "ReadDeviceInformationResponse", -] diff --git a/pymodbus/other_message.py b/pymodbus/other_message.py index 2d9a76291..7f266080c 100644 --- a/pymodbus/other_message.py +++ b/pymodbus/other_message.py @@ -2,6 +2,18 @@ Currently not all implemented """ + +__all__ = [ + "ReadExceptionStatusRequest", + "ReadExceptionStatusResponse", + "GetCommEventCounterRequest", + "GetCommEventCounterResponse", + "GetCommEventLogRequest", + "GetCommEventLogResponse", + "ReportSlaveIdRequest", + "ReportSlaveIdResponse", +] + # pylint: disable=missing-type-doc import struct @@ -473,24 +485,3 @@ def __str__(self): "ReportSlaveIdResponse(%s, %s, %s)" # pylint: disable=consider-using-f-string % arguments ) - - -# ---------------------------------------------------------------------------# -# TODO Make these only work on serial # pylint: disable=fixme -# ---------------------------------------------------------------------------# -# report device identification 43, 14 - - -# ---------------------------------------------------------------------------# -# Exported symbols -# ---------------------------------------------------------------------------# -__all__ = [ - "ReadExceptionStatusRequest", - "ReadExceptionStatusResponse", - "GetCommEventCounterRequest", - "GetCommEventCounterResponse", - "GetCommEventLogRequest", - "GetCommEventLogResponse", - "ReportSlaveIdRequest", - "ReportSlaveIdResponse", -] diff --git a/pymodbus/payload.py b/pymodbus/payload.py index a5de2dc12..146bf5330 100644 --- a/pymodbus/payload.py +++ b/pymodbus/payload.py @@ -3,6 +3,12 @@ A collection of utilities for building and decoding modbus messages payloads. """ + +__all__ = [ + "BinaryPayloadBuilder", + "BinaryPayloadDecoder", +] + # pylint: disable=missing-type-doc from struct import pack, unpack @@ -465,9 +471,3 @@ def skip_bytes(self, nbytes): :param nbytes: The number of bytes to skip """ self._pointer += nbytes - - -# ---------------------------------------------------------------------------# -# Exported Identifiers -# ---------------------------------------------------------------------------# -__all__ = ["BinaryPayloadBuilder", "BinaryPayloadDecoder"] diff --git a/pymodbus/pdu.py b/pymodbus/pdu.py index 81bb7c1f8..59f580ca1 100644 --- a/pymodbus/pdu.py +++ b/pymodbus/pdu.py @@ -1,4 +1,13 @@ """Contains base classes for modbus request/response/error packets.""" + +__all__ = [ + "ModbusRequest", + "ModbusResponse", + "ModbusExceptions", + "ExceptionResponse", + "IllegalFunctionRequest", +] + # pylint: disable=missing-type-doc import struct @@ -243,17 +252,3 @@ def execute(self, _context): :returns: The error response packet """ return ExceptionResponse(self.function_code, self.ErrorCode) - - -# --------------------------------------------------------------------------- # -# Exported symbols -# --------------------------------------------------------------------------- # - - -__all__ = [ - "ModbusRequest", - "ModbusResponse", - "ModbusExceptions", - "ExceptionResponse", - "IllegalFunctionRequest", -] diff --git a/pymodbus/register_read_message.py b/pymodbus/register_read_message.py index 850d74c61..5ee0fafc5 100644 --- a/pymodbus/register_read_message.py +++ b/pymodbus/register_read_message.py @@ -1,4 +1,15 @@ """Register Reading Request/Response.""" + +__all__ = [ + "ReadHoldingRegistersRequest", + "ReadHoldingRegistersResponse", + "ReadInputRegistersRequest", + "ReadInputRegistersResponse", + "ReadRegistersResponseBase", + "ReadWriteMultipleRegistersRequest", + "ReadWriteMultipleRegistersResponse", +] + # pylint: disable=missing-type-doc import struct @@ -390,17 +401,3 @@ def __str__(self): :returns: A string representation of the instance """ return f"ReadWriteNRegisterResponse ({len(self.registers)})" - - -# ---------------------------------------------------------------------------# -# Exported symbols -# ---------------------------------------------------------------------------# -__all__ = [ - "ReadHoldingRegistersRequest", - "ReadHoldingRegistersResponse", - "ReadInputRegistersRequest", - "ReadInputRegistersResponse", - "ReadRegistersResponseBase", - "ReadWriteMultipleRegistersRequest", - "ReadWriteMultipleRegistersResponse", -] diff --git a/pymodbus/register_write_message.py b/pymodbus/register_write_message.py index a49e8bc00..30a04264a 100644 --- a/pymodbus/register_write_message.py +++ b/pymodbus/register_write_message.py @@ -1,4 +1,14 @@ """Register Writing Request/Response Messages.""" + +__all__ = [ + "WriteSingleRegisterRequest", + "WriteSingleRegisterResponse", + "WriteMultipleRegistersRequest", + "WriteMultipleRegistersResponse", + "MaskWriteRegisterRequest", + "MaskWriteRegisterResponse", +] + # pylint: disable=missing-type-doc import struct @@ -359,16 +369,3 @@ def decode(self, data): :param data: The packet data to decode """ self.address, self.and_mask, self.or_mask = struct.unpack(">HHH", data) - - -# ---------------------------------------------------------------------------# -# Exported symbols -# ---------------------------------------------------------------------------# -__all__ = [ - "WriteSingleRegisterRequest", - "WriteSingleRegisterResponse", - "WriteMultipleRegistersRequest", - "WriteMultipleRegistersResponse", - "MaskWriteRegisterRequest", - "MaskWriteRegisterResponse", -] diff --git a/pymodbus/server/__init__.py b/pymodbus/server/__init__.py index e9f22d0a0..70793baa8 100644 --- a/pymodbus/server/__init__.py +++ b/pymodbus/server/__init__.py @@ -2,30 +2,7 @@ import external classes, to make them easier to use: """ -from pymodbus.server.async_io import ( - ModbusSerialServer, - ModbusTcpServer, - ModbusTlsServer, - ModbusUdpServer, - ModbusUnixServer, - ServerAsyncStop, - ServerStop, - StartAsyncSerialServer, - StartAsyncTcpServer, - StartAsyncTlsServer, - StartAsyncUdpServer, - StartAsyncUnixServer, - StartSerialServer, - StartTcpServer, - StartTlsServer, - StartUdpServer, -) -from pymodbus.server.simulator.http_server import ModbusSimulatorServer - -# ---------------------------------------------------------------------------# -# Exported symbols -# ---------------------------------------------------------------------------# __all__ = [ "ModbusSerialServer", "ModbusSimulatorServer", @@ -45,3 +22,23 @@ "StartTlsServer", "StartUdpServer", ] + +from pymodbus.server.async_io import ( + ModbusSerialServer, + ModbusTcpServer, + ModbusTlsServer, + ModbusUdpServer, + ModbusUnixServer, + ServerAsyncStop, + ServerStop, + StartAsyncSerialServer, + StartAsyncTcpServer, + StartAsyncTlsServer, + StartAsyncUdpServer, + StartAsyncUnixServer, + StartSerialServer, + StartTcpServer, + StartTlsServer, + StartUdpServer, +) +from pymodbus.server.simulator.http_server import ModbusSimulatorServer diff --git a/pymodbus/server/reactive/default_config.py b/pymodbus/server/reactive/default_config.py index 90718339c..0c861757a 100644 --- a/pymodbus/server/reactive/default_config.py +++ b/pymodbus/server/reactive/default_config.py @@ -64,5 +64,3 @@ }, }, } - -__all__ = ["DEFAULT_CONFIG"] diff --git a/pymodbus/transaction.py b/pymodbus/transaction.py index 50893ac90..9c5158c02 100644 --- a/pymodbus/transaction.py +++ b/pymodbus/transaction.py @@ -1,4 +1,15 @@ """Collection of transaction based abstractions.""" + +__all__ = [ + "FifoTransactionManager", + "DictTransactionManager", + "ModbusSocketFramer", + "ModbusTlsFramer", + "ModbusRtuFramer", + "ModbusAsciiFramer", + "ModbusBinaryFramer", +] + # pylint: disable=missing-type-doc import socket import struct @@ -569,19 +580,3 @@ def delTransaction(self, tid): Log.debug("Deleting transaction {}", tid) if self.transactions: self.transactions.pop(0) - - -# --------------------------------------------------------------------------- # -# Exported symbols -# --------------------------------------------------------------------------- # - - -__all__ = [ - "FifoTransactionManager", - "DictTransactionManager", - "ModbusSocketFramer", - "ModbusTlsFramer", - "ModbusRtuFramer", - "ModbusAsciiFramer", - "ModbusBinaryFramer", -] diff --git a/pymodbus/utilities.py b/pymodbus/utilities.py index bcb429a7c..98d95826b 100644 --- a/pymodbus/utilities.py +++ b/pymodbus/utilities.py @@ -3,6 +3,18 @@ A collection of utilities for packing data, unpacking data computing checksums, and decode checksums. """ + +__all__ = [ + "pack_bitstring", + "unpack_bitstring", + "default", + "computeCRC", + "checkCRC", + "computeLRC", + "checkLRC", + "rtuFrameSize", +] + # pylint: disable=missing-type-doc import struct @@ -266,18 +278,3 @@ def hexlify_packets(packet): if not packet: return "" return " ".join([hex(int(x)) for x in packet]) - - -# --------------------------------------------------------------------------- # -# Exported symbols -# --------------------------------------------------------------------------- # -__all__ = [ - "pack_bitstring", - "unpack_bitstring", - "default", - "computeCRC", - "checkCRC", - "computeLRC", - "checkLRC", - "rtuFrameSize", -] diff --git a/test/__init__.py b/test/__init__.py index 4c9a1cf6f..a8e0472a0 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -1,6 +1 @@ """Dummy.""" - -from unittest import mock - - -__all__ = ["mock"] diff --git a/test/test_client.py b/test/test_client.py index d550fab73..757975f96 100755 --- a/test/test_client.py +++ b/test/test_client.py @@ -2,7 +2,7 @@ import asyncio import socket import ssl -from test import mock +from unittest import mock import pytest diff --git a/test/test_client_sync.py b/test/test_client_sync.py index 2eaf0570e..c76cb790d 100755 --- a/test/test_client_sync.py +++ b/test/test_client_sync.py @@ -1,8 +1,8 @@ """Test client sync.""" import ssl from itertools import count -from test import mock from test.conftest import mockSocket +from unittest import mock import pytest import serial diff --git a/test/test_client_sync_diag.py b/test/test_client_sync_diag.py index d7b2b81f4..ec220b61c 100755 --- a/test/test_client_sync_diag.py +++ b/test/test_client_sync_diag.py @@ -1,8 +1,8 @@ """Test client sync diag.""" import socket from itertools import count -from test import mock from test.test_client_sync import mockSocket +from unittest import mock import pytest diff --git a/test/test_framers.py b/test/test_framers.py index d59456542..de2eb34e3 100644 --- a/test/test_framers.py +++ b/test/test_framers.py @@ -1,5 +1,5 @@ """Test framers.""" -from test import mock +from unittest import mock import pytest diff --git a/test/test_logging.py b/test/test_logging.py index b2fb87cd3..4c7e1cff4 100644 --- a/test/test_logging.py +++ b/test/test_logging.py @@ -1,6 +1,6 @@ """Test datastore.""" import logging -from test import mock +from unittest import mock import pytest diff --git a/test/test_other_messages.py b/test/test_other_messages.py index 0b03bfb8c..ed2174e20 100644 --- a/test/test_other_messages.py +++ b/test/test_other_messages.py @@ -1,5 +1,5 @@ """Test other messages.""" -from test import mock +from unittest import mock import pymodbus.other_message as pymodbus_message diff --git a/test/test_remote_datastore.py b/test/test_remote_datastore.py index 11f084a78..ec155d925 100644 --- a/test/test_remote_datastore.py +++ b/test/test_remote_datastore.py @@ -1,5 +1,5 @@ """Test remote datastore.""" -from test import mock +from unittest import mock import pytest diff --git a/test/test_server_asyncio.py b/test/test_server_asyncio.py index f8e0c6d7a..518e008e4 100755 --- a/test/test_server_asyncio.py +++ b/test/test_server_asyncio.py @@ -3,7 +3,7 @@ import logging import ssl from asyncio import CancelledError -from test import mock +from unittest import mock import pytest diff --git a/test/test_server_task.py b/test/test_server_task.py index 3629c7a2f..c1511e12c 100755 --- a/test/test_server_task.py +++ b/test/test_server_task.py @@ -2,9 +2,9 @@ import asyncio import logging import os -from test import mock from threading import Thread from time import sleep +from unittest import mock import pytest diff --git a/test/test_transaction.py b/test/test_transaction.py index 3425bed3e..967f6e443 100755 --- a/test/test_transaction.py +++ b/test/test_transaction.py @@ -1,7 +1,7 @@ """Test transaction.""" from binascii import a2b_hex from itertools import count -from test import mock +from unittest import mock import pytest