default argument ModbusSequentialDataBlock (#2622)

Co-authored-by: maxime <maxime.leurent@totalenergies.com>

Author: 2 people

pymodbus/datastore/context.py

@@ -83,17 +83,17 @@ class ModbusSlaveContext(ModbusBaseSlaveContext):
     """
 
     def __init__(self, *_args,
-                    di=ModbusSequentialDataBlock.create(),
-                    co=ModbusSequentialDataBlock.create(),
-                    ir=ModbusSequentialDataBlock.create(),
-                    hr=ModbusSequentialDataBlock.create(),
+                    di: ModbusSequentialDataBlock | None = None,
+                    co: ModbusSequentialDataBlock | None = None,
+                    ir: ModbusSequentialDataBlock | None = None,
+                    hr: ModbusSequentialDataBlock | None = None,
                 ):
         """Initialize the datastores."""
         self.store = {}
-        self.store["d"] = di
-        self.store["c"] = co
-        self.store["i"] = ir
-        self.store["h"] = hr
+        self.store["d"] = di or ModbusSequentialDataBlock.create()
+        self.store["c"] = co or ModbusSequentialDataBlock.create()
+        self.store["i"] = ir or ModbusSequentialDataBlock.create()
+        self.store["h"] = hr or ModbusSequentialDataBlock.create()
 
     def __str__(self):
         """Return a string representation of the context.

test/server/test_server_context.py

@@ -92,10 +92,10 @@ def test_multiple_context_default(self):
             self.context[0x00]()
 
     def test_multiple_context_set(self):
-        """Test a setting multiple slave contexts."""
-        slaves = {id: ModbusSlaveContext() for id in range(10)}
-        for dev_id, slave in iter(slaves.items()):
-            self.context[dev_id] = slave
-        for dev_id, slave in iter(slaves.items()):
+        """Test a setting multiple device< contexts."""
+        devices = {id: ModbusSlaveContext() for id in range(10)}
+        for dev_id, device in iter(devices.items()):
+            self.context[dev_id] = device
+        for dev_id, device in iter(devices.items()):
             actual = self.context[dev_id]
-            assert slave == actual
+            assert device == actual