FRAMER_NAME_TO_OLD_CLASS.

pymodbus-dev · Oct 4, 2024 · 9768e54 · 9768e54
1 parent 3c4edbf
commit 9768e54
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/pymodbus/client/base.py b/pymodbus/client/base.py
@@ -11,7 +11,7 @@
 from pymodbus.client.modbusclientprotocol import ModbusClientProtocol
 from pymodbus.exceptions import ConnectionException, ModbusIOException
 from pymodbus.factory import ClientDecoder
-from pymodbus.framer import FRAMER_NAME_TO_CLASS, FramerType, ModbusFramer
+from pymodbus.framer import FRAMER_NAME_TO_OLD_CLASS, FramerType, ModbusFramer
 from pymodbus.logging import Log
 from pymodbus.pdu import ModbusRequest, ModbusResponse
 from pymodbus.transaction import SyncModbusTransactionManager
@@ -188,7 +188,7 @@ def __init__(
         self.slaves: list[int] = []
 
         # Common variables.
-        self.framer: ModbusFramer = FRAMER_NAME_TO_CLASS.get(
+        self.framer: ModbusFramer = FRAMER_NAME_TO_OLD_CLASS.get(
             framer, cast(type[ModbusFramer], framer)
         )(ClientDecoder(), self)
         self.transaction = SyncModbusTransactionManager(

diff --git a/pymodbus/client/modbusclientprotocol.py b/pymodbus/client/modbusclientprotocol.py
@@ -5,7 +5,7 @@
 from typing import cast
 
 from pymodbus.factory import ClientDecoder
-from pymodbus.framer import FRAMER_NAME_TO_CLASS, FramerType, ModbusFramer
+from pymodbus.framer import FRAMER_NAME_TO_OLD_CLASS, FramerType, ModbusFramer
 from pymodbus.logging import Log
 from pymodbus.transaction import ModbusTransactionManager
 from pymodbus.transport import CommParams, ModbusProtocol
@@ -32,7 +32,7 @@ def __init__(
         self.on_connect_callback = on_connect_callback
 
         # Common variables.
-        self.framer = FRAMER_NAME_TO_CLASS.get(
+        self.framer = FRAMER_NAME_TO_OLD_CLASS.get(
             framer, cast(type[ModbusFramer], framer)
         )(ClientDecoder(), self)
         self.transaction = ModbusTransactionManager()

diff --git a/pymodbus/framer/__init__.py b/pymodbus/framer/__init__.py
@@ -1,7 +1,7 @@
 """Framer."""
 __all__ = [
     "Framer",
-    "FRAMER_NAME_TO_CLASS",
+    "FRAMER_NAME_TO_OLD_CLASS",
     "ModbusFramer",
     "ModbusAsciiFramer",
     "ModbusRtuFramer",
@@ -19,7 +19,7 @@
 from pymodbus.framer.old_framer_tls import ModbusTlsFramer
 
 
-FRAMER_NAME_TO_CLASS = {
+FRAMER_NAME_TO_OLD_CLASS = {
     FramerType.ASCII: ModbusAsciiFramer,
     FramerType.RTU: ModbusRtuFramer,
     FramerType.SOCKET: ModbusSocketFramer,

diff --git a/pymodbus/server/async_io.py b/pymodbus/server/async_io.py
@@ -11,7 +11,7 @@
 from pymodbus.device import ModbusControlBlock, ModbusDeviceIdentification
 from pymodbus.exceptions import NoSuchSlaveException
 from pymodbus.factory import ServerDecoder
-from pymodbus.framer import FRAMER_NAME_TO_CLASS, FramerType, ModbusFramer
+from pymodbus.framer import FRAMER_NAME_TO_OLD_CLASS, FramerType, ModbusFramer
 from pymodbus.logging import Log
 from pymodbus.pdu import ModbusExceptions as merror
 from pymodbus.transport import CommParams, CommType, ModbusProtocol
@@ -274,7 +274,7 @@ def __init__(
         if isinstance(identity, ModbusDeviceIdentification):
             self.control.Identity.update(identity)
 
-        self.framer = FRAMER_NAME_TO_CLASS.get(framer, framer)
+        self.framer = FRAMER_NAME_TO_OLD_CLASS.get(framer, framer)
         self.serving: asyncio.Future = asyncio.Future()
 
     def callback_new_connection(self):