Solve SONARcloud problems. (#869)

Author: janiversen

doc/api/pydoc/build.py

@@ -93,8 +93,8 @@ def classify_class_attrs(cls):
 class DefaultFormatter(pydoc.HTMLDoc):
 	def docmodule(self, object, name=None, mod=None, packageContext = None, *ignored):
 		"""Produce HTML documentation for a module object."""
-		name = object.__name__ # ignore the passed-in name
-		parts = split(name, '.')
+		my_name = object.__name__ # ignore the passed-in name
+		parts = split(my_name, '.')
 		links = []
 		for i in range(len(parts)-1):
 			links.append(
@@ -135,7 +135,7 @@ def docmodule(self, object, name=None, mod=None, packageContext = None, *ignored
 			for base in value.__bases__:
 				key, modname = base.__name__, base.__module__
 				module = sys.modules.get(modname)
-				if modname != name and module and hasattr(module, key):
+				if modname != my_name and module and hasattr(module, key):
 					if getattr(module, key) is base:
 						if not cdict.has_key(key):
 							cdict[key] = cdict[base] = modname + '.html#' + key
@@ -165,10 +165,10 @@ def docmodule(self, object, name=None, mod=None, packageContext = None, *ignored
 				path = os.path.join(object.__path__[0], file)
 				modname = inspect.getmodulename(file)
 				if modname and modname not in modnames:
-					modpkgs.append((modname, name, 0, 0))
+					modpkgs.append((modname, my_name, 0, 0))
 					modnames.append(modname)
 				elif pydoc.ispackage(path):
-					modpkgs.append((file, name, 1, 0))
+					modpkgs.append((file, my_name, 1, 0))
 			modpkgs.sort()
 			contents = self.multicolumn(modpkgs, self.modpkglink)
 ##			result = result + self.bigsection(
@@ -184,15 +184,15 @@ def docmodule(self, object, name=None, mod=None, packageContext = None, *ignored
 		if classes:
 #FIX			classlist = map(lambda (key, value): value, classes)
 			contents = [
-				self.formattree(inspect.getclasstree(classlist, 1), name)]
+				self.formattree(inspect.getclasstree(classlist, 1), my_name)]
 			for key, value in classes:
-				contents.append(self.document(value, key, name, fdict, cdict))
+				contents.append(self.document(value, key, my_name, fdict, cdict))
 			result = result + self.bigsection(
 				'Classes', '#ffffff', '#ee77aa', join(contents))
 		if funcs:
 			contents = []
 			for key, value in funcs:
-				contents.append(self.document(value, key, name, fdict, cdict))
+				contents.append(self.document(value, key, my_name, fdict, cdict))
 			result = result + self.bigsection(
 				'Functions', '#ffffff', '#eeaa77', join(contents))
 		if data:

examples/common/async_tornado_client_serial.py

@@ -159,9 +159,9 @@ def callback(protocol, future): # pylint: disable=redefined-outer-name
     # ----------------------------------------------------------------------- #
 
     # Rtu
-    protocol, future = AsyncModbusSerialClient(schedulers.IO_LOOP, # pylint: disable=unpacking-non-sequence
+    protocol, future = AsyncModbusSerialClient(schedulers.IO_LOOP, # NOSONAR pylint: disable=unpacking-non-sequence
                                                method="rtu",
-                                               port="/tmp/ptyp0", #nosec
+                                               port="/tmp/ptyp0", # nosec NOSONAR
                                                baudrate=9600,
                                                timeout=2)
 

examples/common/async_twisted_client_serial.py

@@ -19,7 +19,7 @@
 # state a few constants
 # ---------------------------------------------------------------------------#
 
-SERIAL_PORT = "/tmp/ptyp0" #nosec
+SERIAL_PORT = "/tmp/ptyp0" # nosec NOSONAR
 STATUS_REGS = (1, 2)
 STATUS_COILS = (1, 3)
 CLIENT_DELAY = 1

examples/contrib/asynchronous_asyncio_serial_client.py

@@ -99,7 +99,7 @@ def make_protocol():
 
 if __name__ == '__main__':
     loop = asyncio.get_event_loop()
-    coro = create_serial_connection(loop, make_protocol, '/tmp/ttyp0', #nosec
+    coro = create_serial_connection(loop, make_protocol, '/tmp/ttyp0', # nosec NOSONAR
                                     baudrate=9600)
     transport, protocol = loop.run_until_complete(asyncio.gather(coro))[0]
     loop.run_until_complete(start_async_test(protocol))

examples/contrib/concurrent_client.py

@@ -29,7 +29,7 @@
 # -------------------------------------------------------------------------- #
 log = logging.getLogger("pymodbus")
 log.setLevel(logging.DEBUG)
-logging.basicConfig()
+logging.basicConfig() # NOSONAR
 
 
 # -------------------------------------------------------------------------- #

examples/contrib/serial_forwarder.py

@@ -31,7 +31,7 @@ def run_serial_forwarder():
     # Note this would send the requests on the serial client with address = 0
 
     # ----------------------------------------------------------------------- #
-    client = ModbusClient(method='rtu', port='/tmp/ptyp0') #nosec
+    client = ModbusClient(method='rtu', port='/tmp/ptyp0') # nosec NOSONAR
     # If required to communicate with a specified client use unit=<unit_id>
     # in RemoteSlaveContext
     # For e.g to forward the requests to slave with unit address 1 use

examples/contrib/sunspec_client.py

@@ -192,8 +192,8 @@ def __init__(self, payload, byteorder):
         .. note:: This is always set to big endian byte order
         as specified in the protocol.
         """
-        byteorder = Endian.Big
-        BinaryPayloadDecoder.__init__(self, payload, byteorder)
+        my_byteorder = Endian.Big
+        BinaryPayloadDecoder.__init__(self, payload, my_byteorder)
 
     def decode_string(self, size=1):
         """ Decodes a string from the buffer

test/test_client_async.py

@@ -70,7 +70,7 @@ def test_callback(client): # pylint: disable=unused-argument
     @patch("pymodbus.client.asynchronous.tornado.IOStream")
     def test_tcp_tornado_client(self, mock_iostream, mock_ioloop): # pylint: disable=no-self-use,unused-argument
         """ Test the TCP tornado client client initialize """
-        protocol, future = AsyncModbusTCPClient( # pylint: disable=unpacking-non-sequence
+        protocol, future = AsyncModbusTCPClient( # NOSOANR pylint: disable=unpacking-non-sequence
             schedulers.IO_LOOP, framer=ModbusSocketFramer(ClientDecoder()))
         client = future.result()
         assert isinstance(client, AsyncTornadoModbusTcpClient) #nosec

test/test_client_async_asyncio.py

@@ -113,7 +113,7 @@ def test_initialization_serial_in_loop(self): # pylint: disable=no-self-use
         _, client = AsyncModbusSerialClient( #NOSONAR pylint: disable=unpacking-non-sequence
             schedulers.ASYNC_IO, port='/tmp/ptyp0', baudrate=9600, method='rtu') #NOSONAR #nosec
 
-        assert client.port == '/tmp/ptyp0' #nosec
+        assert client.port == '/tmp/ptyp0' # nosec NOSONAR
         assert client.baudrate == 9600 #nosec
 
     def test_factory_reset_wait_before_reconnect(self): # pylint: disable=no-self-use

test/test_device.py

@@ -235,24 +235,24 @@ def test_modbus_control_block_invalid_diagnostic(self):
 
     def test_add_remove__single_clients(self):
         """ Test adding and removing a host """
-        self.assertFalse(self.access.check("192.168.1.1"))
-        self.access.add("192.168.1.1")
-        self.assertTrue(self.access.check("192.168.1.1"))
-        self.access.add("192.168.1.1")
-        self.access.remove("192.168.1.1")
-        self.assertFalse(self.access.check("192.168.1.1"))
+        self.assertFalse(self.access.check("192.168.1.1"))  # NOSONAR
+        self.access.add("192.168.1.1")  # NOSONAR
+        self.assertTrue(self.access.check("192.168.1.1"))  # NOSONAR
+        self.access.add("192.168.1.1")  # NOSONAR
+        self.access.remove("192.168.1.1")  # NOSONAR
+        self.assertFalse(self.access.check("192.168.1.1"))  # NOSONAR
 
     def test_add_remove_multiple_clients(self):
         """ Test adding and removing a host """
-        clients = ["192.168.1.1", "192.168.1.2", "192.168.1.3"]
+        clients = ["192.168.1.1", "192.168.1.2", "192.168.1.3"]  # NOSONAR
         self.access.add(clients)
         for host in clients:
             self.assertTrue(self.access.check(host))
         self.access.remove(clients)
 
     def test_network_access_list_iterator(self):
         """ Test adding and removing a host """
-        clients = ["127.0.0.1", "192.168.1.1", "192.168.1.2", "192.168.1.3"]
+        clients = ["127.0.0.1", "192.168.1.1", "192.168.1.2", "192.168.1.3"]  # NOSONAR
         self.access.add(clients)
         for host in self.access:
             self.assertTrue(host in clients)