refactor (lint): adapt to pylint 2.16.0

Author: chaen

src/DIRAC/ConfigurationSystem/Agent/GOCDB2CSAgent.py

@@ -59,7 +59,7 @@ def execute(self):
         for option, functionCall in GOCDB2CSAgent._functionMap.items():
             optionValue = self.am_getOption(option, True)
             if optionValue:
-                result = functionCall(self)
+                result = functionCall(self)  # pylint: disable=too-many-function-args
                 if not result["OK"]:
                     self.log.error("%s() failed with message: %s" % (functionCall.__name__, result["Message"]))
                 else:

src/DIRAC/Core/Utilities/Graphs/PlotBase.py

@@ -3,6 +3,9 @@
     The DIRAC Graphs package is derived from the GraphTool plotting package of the
     CMS/Phedex Project by ... <to be added>
 """
+# matplotlib dynamicaly defines all the get_xticklabels and the like,
+# so we just ignore it
+# pylint: disable=not-callable
 
 from __future__ import print_function
 from __future__ import absolute_import

src/DIRAC/Core/Utilities/Graphs/QualityMapGraph.py

@@ -172,10 +172,10 @@ def draw(self):
                 self.ax.set_xlim(xmin=start_plot, xmax=end_plot)
             else:
                 self.ax.set_xlim(xmin=min(tmp_x), xmax=max(tmp_x))
-        self.ax.set_yticks([i + 0.5 for i in range(nLabel)])
-        self.ax.set_yticklabels(labelNames)
-        setp(self.ax.get_xticklines(), markersize=0.0)
-        setp(self.ax.get_yticklines(), markersize=0.0)
+        self.ax.set_yticks([i + 0.5 for i in range(nLabel)])  # pylint: disable=not-callable
+        self.ax.set_yticklabels(labelNames)  # pylint: disable=not-callable
+        setp(self.ax.get_xticklines(), markersize=0.0)  # pylint: disable=not-callable
+        setp(self.ax.get_yticklines(), markersize=0.0)  # pylint: disable=not-callable
 
         cax, kw = make_axes(self.ax, orientation="vertical", fraction=0.07)
         cb = ColorbarBase(

src/DIRAC/Core/Utilities/Pfn.py

@@ -59,7 +59,7 @@ def srm_pfnunparse(pfnDict):
             # host:port
             uri = "%s:%s" % (pfnDict["Host"], pfnDict["Port"])
         if pfnDict["WSUrl"]:
-            if "?" in pfnDict["WSUrl"] and "=" in pfnDict["WSUrl"]:
+            if "?" in pfnDict["WSUrl"] and "=" in pfnDict["WSUrl"]:  # pylint: disable=unsupported-membership-test
                 # host/wsurl
                 # host:port/wsurl
                 uri = "%s%s" % (uri, pfnDict["WSUrl"])

src/DIRAC/MonitoringSystem/DB/MonitoringDB.py

@@ -214,7 +214,7 @@ def retrieveBucketedData(
                     continue
                 kwargs = {cond: condValue}
                 if query:
-                    query = query | self._Q("term", **kwargs)
+                    query = query | self._Q("term", **kwargs)  # pylint: disable=unsupported-binary-operation
                 else:
                     query = self._Q("term", **kwargs)
             if query:
@@ -349,7 +349,7 @@ def retrieveAggregatedData(
                     continue
                 kwargs = {cond: condValue}
                 if query:
-                    query = query | self._Q("term", **kwargs)
+                    query = query | self._Q("term", **kwargs)  # pylint: disable=unsupported-binary-operation
                 else:
                     query = self._Q("term", **kwargs)
             if query:

src/DIRAC/RequestManagementSystem/DB/RequestDB.py

@@ -3,6 +3,8 @@
 # pylint: disable=no-member
 ########################################################################
 
+# We disable pylint no-callable because of https://github.com/PyCQA/pylint/issues/8138
+
 """ Frontend for ReqDB
 
     :mod: RequestDB
@@ -573,21 +575,31 @@ def getDBSummary(self):
         session = self.DBSession()
 
         try:
-            requestQuery = session.query(Request._Status, func.count(Request.RequestID)).group_by(Request._Status).all()
+            requestQuery = (
+                session.query(Request._Status, func.count(Request.RequestID))  # pylint: disable=not-callable
+                .group_by(Request._Status)
+                .all()
+            )
 
             for status, count in requestQuery:
                 retDict["Request"][status] = count
 
             operationQuery = (
-                session.query(Operation.Type, Operation._Status, func.count(Operation.OperationID))
+                session.query(
+                    Operation.Type, Operation._Status, func.count(Operation.OperationID)  # pylint: disable=not-callable
+                )
                 .group_by(Operation.Type, Operation._Status)
                 .all()
             )
 
             for oType, status, count in operationQuery:
                 retDict["Operation"].setdefault(oType, {})[status] = count
 
-            fileQuery = session.query(File._Status, func.count(File.FileID)).group_by(File._Status).all()
+            fileQuery = (
+                session.query(File._Status, func.count(File.FileID))  # pylint: disable=not-callable
+                .group_by(File._Status)
+                .all()
+            )
 
             for status, count in fileQuery:
                 retDict["File"][status] = count
@@ -735,7 +747,9 @@ def getRequestCountersWeb(self, groupingAttribute, selectDict):
             groupingAttribute = "Request.%s" % groupingAttribute
 
         try:
-            summaryQuery = session.query(eval(groupingAttribute), func.count(Request.RequestID))
+            summaryQuery = session.query(
+                eval(groupingAttribute), func.count(Request.RequestID)  # pylint: disable=not-callable
+            )
 
             for key, value in selectDict.items():
                 if key == "ToDate":

src/DIRAC/ResourceStatusSystem/Command/test/Test_RSS_Command_VOBOXAvailabilityCommand.py

@@ -15,7 +15,7 @@
 
 try:
     # Python 2: "reload" is built-in
-    reload
+    reload  # pylint: disable=used-before-assignment
 except NameError:
     from importlib import reload  # pylint: disable=no-name-in-module
 

src/DIRAC/Resources/Computing/SSHComputingElement.py

@@ -142,19 +142,12 @@ def __init__(self, host=None, parameters=None):
 
     def __ssh_call(self, command, timeout):
 
-        try:
-            import pexpect
-
-            expectFlag = True
-        except BaseException:
-            from DIRAC.Core.Utilities.Subprocess import shellCall
-
-            expectFlag = False
-
         if not timeout:
             timeout = 999
 
-        if expectFlag:
+        try:
+            import pexpect
+
             ssh_newkey = "Are you sure you want to continue connecting"
             try:
                 child = pexpect.spawn(command, timeout=timeout, encoding="utf-8")
@@ -183,7 +176,9 @@ def __ssh_call(self, command, timeout):
             except Exception as x:
                 res = (-1, "Encountered exception %s: %s" % (Exception, str(x)))
                 return S_ERROR(res)
-        else:
+        except BaseException:
+            from DIRAC.Core.Utilities.Subprocess import shellCall
+
             # Try passwordless login
             result = shellCall(timeout, command)
             #      print ( "!!! SSH command: %s returned %s\n" % (command, result) )

src/DIRAC/Resources/Storage/StorageElement.py

@@ -1168,7 +1168,7 @@ def __executeMethod(self, lfn, *args, **kwargs):
 
         # args should normaly be empty to avoid problem...
         if args:
-            log.debug("args should be empty!%s" % args)
+            log.debug("args should be empty! %s" % (args,))
             # because there is normally only one kw argument, I can move it from args to kwargs
             methDefaultArgs = list(StorageElementItem.__defaultsArguments.get(self.methodName, {}))
             if methDefaultArgs:

src/DIRAC/TransformationSystem/Agent/TransformationAgent.py

@@ -215,10 +215,10 @@ def _execute(self, transDict):
         # Each thread will have its own clients
         clients = self._getClients()
 
+        startTime = time.time()
         try:
             transID = int(transDict["TransformationID"])
             self._logInfo("Processing transformation %s." % transID, transID=transID)
-            startTime = time.time()
             res = self.processTransformation(transDict, clients)
             if not res["OK"]:
                 self._logInfo("Failed to process transformation:", res["Message"], transID=transID)