Active pylint invalid-name, and solve it. (#857)

janiversen · web-flow · commit 5a79e9661eb3 · 2022-04-28T08:10:24.000+02:00
diff --git a/.pylintrc b/.pylintrc
@@ -81,17 +81,17 @@ fail-on=
 enable=
     attribute-defined-outside-init,
     fixme,
+    invalid-name,
     missing-docstring,
     no-self-use,
     protected-access,
     too-few-public-methods,
-    useless-suppression
 
 disable= 
     duplicate-code,
-    invalid-name,
     logging-too-many-args,
     use-symbolic-message-instead,
+    useless-suppression,
     format # handled by black
 
 
diff --git a/examples/common/async_tornado_client.py b/examples/common/async_tornado_client.py
@@ -36,12 +36,12 @@ def _assertor(value):
         # by pass assertion, an error here stops the write callbacks
         assert value #nosec
 
-    def on_done(f):
-        if (exc := f.exception()):
+    def on_done(f_trans):
+        if (exc := f_trans.exception()):
             _logger.debug(exc)
             return _assertor(False)
 
-        return _assertor(callback(f.result()))
+        return _assertor(callback(f_trans.result()))
 
     future.add_done_callback(on_done)
 
diff --git a/examples/common/async_tornado_client_serial.py b/examples/common/async_tornado_client_serial.py
@@ -43,12 +43,12 @@ def _assertor(value):
         # by pass assertion, an error here stops the write callbacks
         assert value #nosec
 
-    def on_done(f):
-        if (exc := f.exception()):
+    def on_done(f_trans):
+        if (exc := f_trans.exception()):
             log.debug(exc)
             return _assertor(False)
 
-        return _assertor(callback(f.result()))
+        return _assertor(callback(f_trans.result()))
 
     future.add_done_callback(on_done)
 
diff --git a/examples/contrib/message_parser.py b/examples/contrib/message_parser.py
@@ -90,19 +90,19 @@ def report(self, message): # pylint: disable=no-self-use
         :param message: The message to print
         """
         print("%-15s = %s" % ('name', message.__class__.__name__)) #NOSONAR pylint: disable=consider-using-f-string
-        for (k, v) in message.__dict__.items():
-            if isinstance(v, dict):
-                print("%-15s =" % k) # pylint: disable=consider-using-f-string
-                for k_item, v_item in v.items():
+        for (k_dict, v_dict) in message.__dict__.items():
+            if isinstance(v_dict, dict):
+                print("%-15s =" % k_dict) # pylint: disable=consider-using-f-string
+                for k_item, v_item in v_dict.items():
                     print("  %-12s => %s" % (k_item, v_item)) # pylint: disable=consider-using-f-string
 
-            elif isinstance(v, collections.Iterable): # pylint: disable=no-member
-                print("%-15s =" % k) # pylint: disable=consider-using-f-string
-                value = str([int(x) for x in v])
+            elif isinstance(v_dict, collections.Iterable): # pylint: disable=no-member
+                print("%-15s =" % k_dict) # pylint: disable=consider-using-f-string
+                value = str([int(x) for x in v_dict])
                 for line in textwrap.wrap(value, 60):
                     print("%-15s . %s" % ("", line)) # pylint: disable=consider-using-f-string
             else:
-                print("%-15s = %s" % (k, hex(v))) # pylint: disable=consider-using-f-string
+                print("%-15s = %s" % (k_dict, hex(v_dict))) # pylint: disable=consider-using-f-string
         print("%-15s = %s" % ('documentation', message.__doc__)) # pylint: disable=consider-using-f-string
 
 
diff --git a/examples/contrib/sunspec_client.py b/examples/contrib/sunspec_client.py
@@ -104,19 +104,19 @@ class SunspecModel: # pylint: disable=too-few-public-methods
     PanelInteger                             = 502  # noqa E221
 
     # ---------------------------------------------
-    # 641xx Outback Blocks
+    # 641xx outback_ Blocks
     # ---------------------------------------------
-    OutbackDeviceIdentifier                  = 64110  # noqa E221
-    OutbackChargeController                  = 64111  # noqa E221
-    OutbackFMSeriesChargeController          = 64112  # noqa E221
-    OutbackFXInverterRealTime                = 64113  # noqa E221
-    OutbackFXInverterConfiguration           = 64114  # noqa E221
-    OutbackSplitPhaseRadianInverter          = 64115  # noqa E221
-    OutbackRadianInverterConfiguration       = 64116  # noqa E221
-    OutbackSinglePhaseRadianInverterRealTime = 64117  # noqa E221
-    OutbackFLEXNetDCRealTime                 = 64118  # noqa E221
-    OutbackFLEXNetDCConfiguration            = 64119  # noqa E221
-    OutbackSystemControl                     = 64120  # noqa E221
+    outback_device_identifier       = 64110  # noqa E221
+    outback_charge_controller       = 64111  # noqa E221
+    outback_fm_charge_controller    = 64112  # noqa E221
+    outback_fx_inv_realtime         = 64113  # noqa E221
+    outback_fx_inv_conf             = 64114  # noqa E221
+    outback_split_phase_rad_inv     = 64115  # noqa E221
+    outback_radian_inv_conf         = 64116  # noqa E221
+    outback_single_phase_rad_inv_rt = 64117  # noqa E221
+    outback_flexnet_dc_realtime     = 64118  # noqa E221
+    outback_flexnet_dc_conf         = 64119  # noqa E221
+    outback_system_control          = 64120  # noqa E221
 
     # ---------------------------------------------
     # 64xxx Vendor Extension Block
diff --git a/pymodbus/client/asynchronous/async_io/__init__.py b/pymodbus/client/asynchronous/async_io/__init__.py
@@ -75,23 +75,26 @@ def create_future(self): # pylint: disable=no-self-use
         """ Helper function to create asyncio Future object. """
         return asyncio.Future()
 
-    def resolve_future(self, f, result): # pylint: disable=no-self-use
+    def resolve_future(self, my_future, result):
         """ Resolves the completed future and sets the result
         :param f:
         :param result:
         :return:
         """
-        if not f.done():
-            f.set_result(result)
 
-    def raise_future(self, f, exc): # pylint: disable=no-self-use
+    def resolve_future(self, my_future, result): # pylint: disable=no-self-use
+        """ Resolve future. """
+        if not my_future.done():
+            my_future.set_result(result)
+
+    def raise_future(self, my_future, exc): # pylint: disable=no-self-use
         """ Sets exception of a future if not done
         :param f:
         :param exc:
         :return:
         """
-        if not f.done():
-            f.set_exception(exc)
+        if not my_future.done():
+            my_future.set_exception(exc)
 
     def _connection_made(self):
         """ Called upon a successful client connection. """
@@ -161,13 +164,13 @@ def _build_response(self, tid):
         :param tid: The transaction identifier for this response
         :returns: A defer linked to the latest request
         """
-        f = self.create_future()
+        my_future = self.create_future()
         if not self._connected:
-            self.raise_future(f, ConnectionException(
+            self.raise_future(my_future, ConnectionException(
                 'Client is not connected'))
         else:
-            self.transaction.addTransaction(f, tid)
-        return f
+            self.transaction.addTransaction(my_future, tid)
+        return my_future
 
     def close(self):
         self.transport.close()
diff --git a/pymodbus/client/asynchronous/tornado/__init__.py b/pymodbus/client/asynchronous/tornado/__init__.py
@@ -107,14 +107,14 @@ def _build_response(self, tid):
         :param tid:
         :return:
         """
-        f = Future()
+        my_future = Future()
 
         if not self._connected:
-            f.set_exception(ConnectionException("Client is not connected"))
-            return f
+            my_future.set_exception(ConnectionException("Client is not connected"))
+            return my_future
 
-        self.transaction.addTransaction(f, tid)
-        return f
+        self.transaction.addTransaction(my_future, tid)
+        return my_future
 
     def close(self):
         """ Closes the underlying IOStream. """
@@ -176,8 +176,8 @@ def callback(*args): # pylint: disable=unused-argument
         txt = f"send: {hexlify_packets(packet)}"
         _logger.debug(txt)
         self.stream.write(packet, callback=callback)
-        f = self._build_response(request.transaction_id)
-        return f
+        response = self._build_response(request.transaction_id)
+        return response
 
     def _handle_response(self, reply, **kwargs): # pylint: disable=unused-argument
         """ Handles a received response and updates a future
@@ -198,14 +198,14 @@ def _build_response(self, tid):
         :param tid:
         :return: Future
         """
-        f = Future()
+        my_future = Future()
 
         if not self._connected:
-            f.set_exception(ConnectionException("Client is not connected"))
-            return f
+            my_future.set_exception(ConnectionException("Client is not connected"))
+            return my_future
 
-        self.transaction.addTransaction(f, tid)
-        return f
+        self.transaction.addTransaction(my_future, tid)
+        return my_future
 
     def close(self):
         """ Closes the underlying IOStream. """
@@ -387,7 +387,7 @@ def _on_receive(fd, events):
                 )
 
         packet = self.framer.buildPacket(request)
-        f = self._build_response(request.transaction_id)
+        response = self._build_response(request.transaction_id)
 
         response_pdu_size = request.get_response_pdu_size()
         expected_response_length = self.transaction._calculate_response_length(response_pdu_size) # pylint: disable=protected-access
@@ -401,7 +401,7 @@ def _on_receive(fd, events):
             self.timeout_handle = self.io_loop.add_timeout(time.time() + self.timeout, _on_timeout) # pylint: disable=attribute-defined-outside-init
         self._send_packet(packet, callback=_on_write_done)
 
-        return f
+        return response
 
     def _send_packet(self, message, callback):
         """ Sends packets on the bus with 3.5char delay between frames
diff --git a/pymodbus/client/sync_diag.py b/pymodbus/client/sync_diag.py
@@ -79,8 +79,8 @@ def __init__(self, host='127.0.0.1', port=Defaults.Port,
             self.warn_delay_limit = self.timeout / 2
 
         # Set logging messages, defaulting to LOG_MSGS
-        for (k, v) in LOG_MSGS.items():
-            self.__dict__[k] = kwargs.get(k, v)
+        for (k_item, v_item) in LOG_MSGS.items():
+            self.__dict__[k_item] = kwargs.get(k_item, v_item)
 
     def connect(self):
         """ Connect to the modbus tcp server
diff --git a/pymodbus/constants.py b/pymodbus/constants.py
@@ -163,7 +163,7 @@ class ModbusStatus(Singleton): # pylint: disable=too-few-public-methods
     """
     Waiting  = 0xffff
     Ready    = 0x0000
-    On       = 0xff00
+    On       = 0xff00 # pylint: disable=invalid-name
     Off      = 0x0000
     SlaveOn  = 0xff
     SlaveOff = 0x00
diff --git a/pymodbus/datastore/store.py b/pymodbus/datastore/store.py
@@ -266,8 +266,8 @@ def _process_values(self, values):
         def _process_as_dict(values):
             for idx, val in iter(values.items()):
                 if isinstance(val, (list, tuple)):
-                    for i, v in enumerate(val):
-                        self.values[idx + i] = v
+                    for i, v_item in enumerate(val):
+                        self.values[idx + i] = v_item
                 else:
                     self.values[idx] = int(val)
         if isinstance(values, dict):
diff --git a/pymodbus/device.py b/pymodbus/device.py
@@ -273,13 +273,13 @@ def __str__(self):
     #-------------------------------------------------------------------------#
     # Properties
     #-------------------------------------------------------------------------#
-    VendorName          = dict_property(lambda s: s.__data, 0) #NOSONAR pylint: disable=protected-access
-    ProductCode         = dict_property(lambda s: s.__data, 1) #NOSONAR pylint: disable=protected-access
-    MajorMinorRevision  = dict_property(lambda s: s.__data, 2) #NOSONAR pylint: disable=protected-access
-    VendorUrl           = dict_property(lambda s: s.__data, 3) #NOSONAR pylint: disable=protected-access
-    ProductName         = dict_property(lambda s: s.__data, 4) #NOSONAR pylint: disable=protected-access
-    ModelName           = dict_property(lambda s: s.__data, 5) #NOSONAR pylint: disable=protected-access
-    UserApplicationName = dict_property(lambda s: s.__data, 6) #NOSONAR pylint: disable=protected-access
+    VendorName          = dict_property(lambda s: s.__data, 0) #NOSONAR pylint: disable=protected-access,invalid-name
+    ProductCode         = dict_property(lambda s: s.__data, 1) #NOSONAR pylint: disable=protected-access,invalid-name
+    MajorMinorRevision  = dict_property(lambda s: s.__data, 2) #NOSONAR pylint: disable=protected-access,invalid-name
+    VendorUrl           = dict_property(lambda s: s.__data, 3) #NOSONAR pylint: disable=protected-access,invalid-name
+    ProductName         = dict_property(lambda s: s.__data, 4) #NOSONAR pylint: disable=protected-access,invalid-name
+    ModelName           = dict_property(lambda s: s.__data, 5) #NOSONAR pylint: disable=protected-access,invalid-name
+    UserApplicationName = dict_property(lambda s: s.__data, 6) #NOSONAR pylint: disable=protected-access,invalid-name
 
 
 class DeviceInformationFactory(Singleton): # pylint: disable=too-few-public-methods
@@ -429,9 +429,9 @@ def update(self, values):
 
         :param values: The value to copy values from
         """
-        for k, v in iter(values.items()):
-            v += self.__getattribute__(k)
-            self.__setattr__(k, v)
+        for k, v_item in iter(values.items()):
+            v_item += self.__getattribute__(k)
+            self.__setattr__(k, v_item)
 
     def reset(self):
         """ This clears all of the system counters
diff --git a/pymodbus/other_message.py b/pymodbus/other_message.py
@@ -355,11 +355,11 @@ def execute(self, context=None): # pylint: disable=no-self-use
 
             # Support identity values as bytes data and regular str data
             id_data = []
-            for v in information.values():
-                if isinstance(v, bytes):
-                    id_data.append(v)
+            for v_item in information.values():
+                if isinstance(v_item, bytes):
+                    id_data.append(v_item)
                 else:
-                    id_data.append(v.encode())
+                    id_data.append(v_item.encode())
 
             identifier = b"-".join(id_data)
             identifier = identifier or b'Pymodbus'
diff --git a/pymodbus/repl/client/helper.py b/pymodbus/repl/client/helper.py
@@ -267,15 +267,15 @@ def raw(self):
     def _process_dict(self, use_dict):
         """ Internal process dict. """
         new_dict = OrderedDict()
-        for k, v in use_dict.items():
-            if isinstance(v, bytes):
-                v = v.decode('utf-8')
-            elif isinstance(v, dict):
-                v = self._process_dict(v)
-            elif isinstance(v, (list, tuple)):
-                v = [v1.decode('utf-8') if isinstance(v1, bytes) else v1
-                     for v1 in v ]
-            new_dict[k] = v
+        for k, v_item in use_dict.items():
+            if isinstance(v_item, bytes):
+                v_item = v_item.decode('utf-8')
+            elif isinstance(v_item, dict):
+                v_item = self._process_dict(v_item)
+            elif isinstance(v_item, (list, tuple)):
+                v_item = [v1.decode('utf-8') if isinstance(v1, bytes) else v1
+                     for v1 in v_item ]
+            new_dict[k] = v_item
         return new_dict
 
     def print_result(self, data=None):
diff --git a/pymodbus/repl/server/main.py b/pymodbus/repl/server/main.py
@@ -74,8 +74,8 @@ def run(ctx, modbus_server, modbus_framer, modbus_port, modbus_unit_id,
     loop = asyncio.get_event_loop()
     framer = DEFAULT_FRAMER.get(modbus_framer, ModbusSocketFramer)
     if modbus_config:
-        with open(modbus_config) as f: # pylint: disable=unspecified-encoding
-            modbus_config = json.load(f)
+        with open(modbus_config) as my_file: # pylint: disable=unspecified-encoding
+            modbus_config = json.load(my_file)
     else:
         modbus_config = DEFUALT_CONFIG
     modbus_config = modbus_config.get(modbus_server, {})
diff --git a/pymodbus/server/async_io.py b/pymodbus/server/async_io.py
diff --git a/pymodbus/server/asynchronous.py b/pymodbus/server/asynchronous.py
diff --git a/pymodbus/server/sync.py b/pymodbus/server/sync.py
diff --git a/test/test_client_async_asyncio.py b/test/test_client_async_asyncio.py
diff --git a/test/test_framers.py b/test/test_framers.py
diff --git a/test/test_utilities.py b/test/test_utilities.py
diff --git a/tox.ini b/tox.ini
