fix: removed py2 compatibility

Author: fstagni

src/DIRAC/MonitoringSystem/Client/MonitoringReporter.py

@@ -27,7 +27,7 @@
 from DIRAC.ConfigurationSystem.Client.Config import gConfig
 
 
-class MonitoringReporter(object):
+class MonitoringReporter:
 
     """
     .. class:: MonitoringReporter

src/DIRAC/MonitoringSystem/Client/Types/BaseType.py

@@ -4,7 +4,7 @@
 ########################################################################
 
 
-class BaseType(object):
+class BaseType:
 
     """
     .. class:: BaseType

src/DIRAC/MonitoringSystem/Service/MonitoringHandler.py

@@ -12,7 +12,6 @@
 """
 import datetime
 import os
-import six
 
 from DIRAC import gLogger, S_OK, S_ERROR, gConfig
 from DIRAC.Core.DISET.RequestHandler import RequestHandler
@@ -37,12 +36,12 @@ class MonitoringHandler(RequestHandler):
     """
 
     __reportRequestDict = {
-        "typeName": six.string_types,
-        "reportName": six.string_types,
+        "typeName": str,
+        "reportName": str,
         "startTime": Time._allDateTypes,
         "endTime": Time._allDateTypes,
         "condDict": dict,
-        "grouping": six.string_types,
+        "grouping": str,
         "extraArgs": dict,
     }
 
@@ -73,7 +72,7 @@ def initializeHandler(cls, serviceInfo):
 
         return S_OK()
 
-    types_listUniqueKeyValues = [six.string_types]
+    types_listUniqueKeyValues = [str]
 
     def export_listUniqueKeyValues(self, typeName):
         """
@@ -87,7 +86,7 @@ def export_listUniqueKeyValues(self, typeName):
         # NOTE: we can apply some policies if it will be needed!
         return self.__db.getKeyValues(typeName)
 
-    types_listReports = [six.string_types]
+    types_listReports = [str]
 
     def export_listReports(self, typeName):
         """
@@ -257,7 +256,7 @@ def export_getReport(self, reportRequest):
         reportRequest["generatePlot"] = False
         return reporter.generate(reportRequest, self.getRemoteCredentials())
 
-    types_addMonitoringRecords = [six.string_types, list]
+    types_addMonitoringRecords = [str, list]
 
     def export_addMonitoringRecords(self, monitoringtype, data):
         """
@@ -275,7 +274,7 @@ def export_addMonitoringRecords(self, monitoringtype, data):
         gLogger.debug("addMonitoringRecords:", prefix)
         return self.__db.bulk_index(prefix, data)
 
-    types_addRecords = [six.string_types, six.string_types, list]
+    types_addRecords = [str, str, list]
 
     def export_addRecords(self, indexname, monitoringType, data):
         """
@@ -293,7 +292,7 @@ def export_addRecords(self, indexname, monitoringType, data):
         gLogger.debug("Mapping:", mapping)
         return self.__db.bulk_index(indexname, data, mapping)
 
-    types_deleteIndex = [six.string_types]
+    types_deleteIndex = [str]
 
     def export_deleteIndex(self, indexName):
         """
@@ -307,7 +306,7 @@ def export_deleteIndex(self, indexName):
         gLogger.debug("delete index:", indexName)
         return self.__db.deleteIndex(indexName)
 
-    types_getLastDayData = [six.string_types, dict]
+    types_getLastDayData = [str, dict]
 
     def export_getLastDayData(self, typeName, condDict):
         """
@@ -322,7 +321,7 @@ def export_getLastDayData(self, typeName, condDict):
 
         return self.__db.getLastDayData(typeName, condDict)
 
-    types_getLimitedDat = [six.string_types, dict, int]
+    types_getLimitedDat = [str, dict, int]
 
     def export_getLimitedData(self, typeName, condDict, size):
         """
@@ -339,7 +338,7 @@ def export_getLimitedData(self, typeName, condDict, size):
         """
         return self.__db.getLimitedData(typeName, condDict, size)
 
-    types_getDataForAGivenPeriod = [six.string_types, dict, six.string_types, six.string_types]
+    types_getDataForAGivenPeriod = [str, dict, str, str]
 
     def export_getDataForAGivenPeriod(self, typeName, condDict, initialDate="", endDate=""):
         """
@@ -358,7 +357,7 @@ def export_getDataForAGivenPeriod(self, typeName, condDict, initialDate="", endD
         """
         return self.__db.getDataForAGivenPeriod(typeName, condDict, initialDate, endDate)
 
-    types_put = [list, six.string_types]
+    types_put = [list, str]
 
     def export_put(self, recordsToInsert, monitoringType):
         """

src/DIRAC/MonitoringSystem/private/DBUtils.py

@@ -20,7 +20,7 @@ def _convertToSeconds(interval):
     raise ValueError("Invalid time interval '%s'" % interval)
 
 
-class DBUtils(object):
+class DBUtils:
 
     """
     .. class:: DBUtils

src/DIRAC/MonitoringSystem/private/MainReporter.py

@@ -10,7 +10,7 @@
 from DIRAC.Core.Utilities.ObjectLoader import loadObjects
 
 
-class PlottersList(object):
+class PlottersList:
 
     """
     Used to determine all available plotters used to create the plots
@@ -41,9 +41,8 @@ def getPlotterClass(self, typeName):
             return S_ERROR()
 
 
-class MainReporter(object):
+class MainReporter:
     """
-    :param object __db: database object
     :param str __setup: DIRAC setup
     :param str __csSection: CS section used to configure some parameters.
     :param list __plotterList: available plotters