pylint.

examples/package_test_tool.py

@@ -45,7 +45,7 @@
 from __future__ import annotations
 
 import asyncio
-from typing import Callable
+from collections.abc import Callable
 
 import pymodbus.client as modbusClient
 import pymodbus.server as modbusServer

pymodbus/client/base.py

@@ -3,8 +3,9 @@
 
 import asyncio
 import socket
+from collections.abc import Awaitable, Callable
 from dataclasses import dataclass
-from typing import Any, Awaitable, Callable, Type, cast
+from typing import Any, cast
 
 from pymodbus.client.mixin import ModbusClientMixin
 from pymodbus.exceptions import ConnectionException, ModbusIOException
@@ -90,7 +91,7 @@ def __init__(
 
         # Common variables.
         self.framer = FRAMER_NAME_TO_CLASS.get(
-            framer, cast(Type[ModbusFramer], framer)
+            framer, cast(type[ModbusFramer], framer)
         )(ClientDecoder(), self)
         self.transaction = ModbusTransactionManager(
             self, retries=retries, retry_on_empty=retry_on_empty, **kwargs
@@ -344,7 +345,7 @@ def __init__(
 
         # Common variables.
         self.framer = FRAMER_NAME_TO_CLASS.get(
-            framer, cast(Type[ModbusFramer], framer)
+            framer, cast(type[ModbusFramer], framer)
         )(ClientDecoder(), self)
         self.transaction = ModbusTransactionManager(
             self, retries=retries, retry_on_empty=retry_on_empty, **kwargs

pymodbus/datastore/simulator.py

@@ -4,8 +4,9 @@
 import dataclasses
 import random
 import struct
+from collections.abc import Callable
 from datetime import datetime
-from typing import Any, Callable
+from typing import Any
 
 
 WORD_SIZE = 16

pymodbus/datastore/store.py

@@ -48,7 +48,8 @@
 from __future__ import annotations
 
 from abc import ABC, abstractmethod
-from typing import Any, Dict, Generic, Iterable, TypeVar
+from collections.abc import Iterable
+from typing import Any, Generic, TypeVar
 
 from pymodbus.exceptions import ParameterException
 
@@ -57,7 +58,7 @@
 #  Datablock Storage
 # ---------------------------------------------------------------------------#
 
-V = TypeVar('V', list, Dict[int, Any])
+V = TypeVar('V', list, dict[int, Any])
 class BaseModbusDataBlock(ABC, Generic[V]):
     """Base class for a modbus datastore.
 
@@ -194,7 +195,7 @@ def setValues(self, address, values):
         self.values[start : start + len(values)] = values
 
 
-class ModbusSparseDataBlock(BaseModbusDataBlock[Dict[int, Any]]):
+class ModbusSparseDataBlock(BaseModbusDataBlock[dict[int, Any]]):
     """A sparse modbus datastore.
 
     E.g Usage.

pymodbus/factory.py

@@ -10,7 +10,7 @@
 """
 
 # pylint: disable=missing-type-doc
-from typing import Callable, Dict
+from collections.abc import Callable
 
 from pymodbus.bit_read_message import (
     ReadCoilsRequest,
@@ -163,15 +163,15 @@ class ServerDecoder:
     ]
 
     @classmethod
-    def getFCdict(cls) -> Dict[int, Callable]:
+    def getFCdict(cls) -> dict[int, Callable]:
         """Build function code - class list."""
         return {f.function_code: f for f in cls.__function_table}  # type: ignore[attr-defined]
 
     def __init__(self) -> None:
         """Initialize the client lookup tables."""
         functions = {f.function_code for f in self.__function_table}  # type: ignore[attr-defined]
         self.lookup = self.getFCdict()
-        self.__sub_lookup: Dict[int, Dict[int, Callable]] = {f: {} for f in functions}
+        self.__sub_lookup: dict[int, dict[int, Callable]] = {f: {} for f in functions}
         for f in self.__sub_function_table:
             self.__sub_lookup[f.function_code][f.sub_function_code] = f  # type: ignore[attr-defined]
 
@@ -300,7 +300,7 @@ def __init__(self) -> None:
         """Initialize the client lookup tables."""
         functions = {f.function_code for f in self.function_table}  # type: ignore[attr-defined]
         self.lookup = {f.function_code: f for f in self.function_table}  # type: ignore[attr-defined]
-        self.__sub_lookup: Dict[int, Dict[int, Callable]] = {f: {} for f in functions}
+        self.__sub_lookup: dict[int, dict[int, Callable]] = {f: {} for f in functions}
         for f in self.__sub_function_table:
             self.__sub_lookup[f.function_code][f.sub_function_code] = f  # type: ignore[attr-defined]
 

pymodbus/transport/transport.py

@@ -52,10 +52,11 @@
 import dataclasses
 import ssl
 from abc import abstractmethod
+from collections.abc import Callable, Coroutine
 from contextlib import suppress
 from enum import Enum
 from functools import partial
-from typing import Any, Callable, Coroutine
+from typing import Any
 
 from pymodbus.logging import Log
 from pymodbus.transport.serialtransport import create_serial_connection

test/test_network.py

@@ -2,7 +2,7 @@
 from __future__ import annotations
 
 import asyncio
-from typing import Callable
+from collections.abc import Callable
 
 import pytest