fix: py2 -> py3 fixes for FrameworkSystem DB modules

Author: fstagni

src/DIRAC/FrameworkSystem/DB/ComponentMonitoringDB.py

@@ -1,6 +1,5 @@
 """ ComponentMonitoring class is a front-end to the Component monitoring Database
 """
-import six
 from urllib import parse
 
 from DIRAC import gConfig, S_OK, S_ERROR
@@ -95,7 +94,7 @@ def __datetime2str(self, dt):
         """
         This method converts the datetime type to a string type.
         """
-        if isinstance(dt, six.string_types):
+        if isinstance(dt, str):
             return dt
         return "%s-%s-%s %s:%s:%s" % (dt.year, dt.month, dt.day, dt.hour, dt.minute, dt.second)
 
@@ -249,9 +248,9 @@ def __getComponents(self, condDict):
         sqlWhere = []
         for field in condDict:
             val = condDict[field]
-            if isinstance(val, six.string_types):
+            if isinstance(val, str):
                 sqlWhere.append("%s='%s'" % (field, val))
-            elif isinstance(val, six.integer_types + (float,)):
+            elif isinstance(val, (int, float)):
                 sqlWhere.append("%s='%s'" % (field, val))
             else:
                 sqlWhere.append("( %s )" % " OR ".join(["%s='%s'" % (field, v) for v in val]))

src/DIRAC/FrameworkSystem/DB/InstalledComponentsDB.py

@@ -1,7 +1,6 @@
 """
 Classes and functions for easier management of the InstalledComponents database
 """
-import six
 import re
 import datetime
 from sqlalchemy import MetaData, Column, Integer, String, DateTime, create_engine, text
@@ -416,7 +415,7 @@ def __filterFields(self, session, table, matchFields=None):
                         toAppend = element
                         if isinstance(toAppend, datetime.datetime):
                             toAppend = toAppend.strftime("%Y-%m-%d %H:%M:%S")
-                        if isinstance(toAppend, six.string_types):
+                        if isinstance(toAppend, str):
                             toAppend = "'%s'" % (toAppend)
                         if i == 0:
                             sql = "%s%s" % (sql, toAppend)
@@ -425,7 +424,7 @@ def __filterFields(self, session, table, matchFields=None):
                     sql = "%s )" % (sql)
                 else:
                     continue
-            elif isinstance(matchFields[key], six.string_types):
+            elif isinstance(matchFields[key], str):
                 sql = "`%s` %s '%s'" % (actualKey, comparison, matchFields[key])
             elif isinstance(matchFields[key], datetime.datetime):
                 sql = "%s %s '%s'" % (actualKey, comparison, matchFields[key].strftime("%Y-%m-%d %H:%M:%S"))

src/DIRAC/FrameworkSystem/DB/UserProfileDB.py

@@ -1,8 +1,6 @@
 """ UserProfileDB class is a front-end to the User Profile Database
 """
 
-import six
-
 import cachetools
 
 from DIRAC import S_OK, S_ERROR
@@ -498,7 +496,7 @@ def deleteVar(self, userName, userGroup, profileName, varName):
         return self.deleteVarByUserId(userIds, profileName, varName)
 
     def __profilesCondGenerator(self, value, varType, initialValue=False):
-        if isinstance(value, six.string_types):
+        if isinstance(value, str):
             value = [value]
         ids = []
         if initialValue:

src/DIRAC/ProductionSystem/DB/ProductionDB.py

@@ -4,7 +4,6 @@
     in order to automate the task of transformation preparation for high level productions.
 """
 # # imports
-import six
 import json
 import threading
 
@@ -149,7 +148,7 @@ def getProductions(
             # TODO: remove, as Description should have been converted to a text type
             row = [item.decode() if isinstance(item, bytes) else item for item in row]
             # Prepare the structure for the web
-            rList = [str(item) if not isinstance(item, six.integer_types) else item for item in row]
+            rList = [str(item) if not isinstance(item, int) else item for item in row]
             prodDict = dict(zip(self.PRODPARAMS, row))
             webList.append(rList)
             resultList.append(prodDict)
@@ -181,7 +180,7 @@ def getProductionParameters(self, prodName, parameters, connection=False):
         :param str prodName: the Production name or ID
         :param str parameters: any valid production parameter in self.PRODPARAMS
         """
-        if isinstance(parameters, six.string_types):
+        if isinstance(parameters, str):
             parameters = [parameters]
         res = self.getProduction(prodName, connection=connection)
         if not res["OK"]:
@@ -319,7 +318,7 @@ def getProductionTransformations(
         resultList = []
         for row in res["Value"]:
             # Prepare the structure for the web
-            rList = [str(item) if not isinstance(item, six.integer_types) else item for item in row]
+            rList = [str(item) if not isinstance(item, int) else item for item in row]
             transDict = dict(zip(self.TRANSPARAMS, row))
             webList.append(rList)
             resultList.append(transDict)
@@ -619,7 +618,7 @@ def _getProductionID(self, prodName, connection=False):
             prodName = int(prodName)
             cmd = "SELECT ProductionID from Productions WHERE ProductionID=%d;" % prodName
         except Exception:
-            if not isinstance(prodName, six.string_types):
+            if not isinstance(prodName, str):
                 return S_ERROR("Production should be ID or name")
             cmd = "SELECT ProductionID from Productions WHERE ProductionName='%s';" % prodName
         res = self._query(cmd, connection)