fix: getting most of py2 code out of WMS

Author: fstagni

src/DIRAC/Core/Base/AgentModule.py

@@ -67,9 +67,8 @@ class AgentModule:
     def __init__(self, agentName, loadName, baseAgentName=False, properties={}):
         """
         Common __init__ method for all Agents.
-        All Agent modules must define:
-        __doc__
-        __RCSID__
+	All Agent modules must define: __doc__
+
         They are used to populate __codeProperties
 
         The following Options are used from the Configuration:

src/DIRAC/Core/Base/__init__.py

@@ -1,5 +0,0 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-__RCSID__ = "$Id$"

src/DIRAC/WorkloadManagementSystem/Agent/CloudDirector.py

@@ -29,7 +29,7 @@ class CloudDirector(AgentModule):
     """
 
     def __init__(self, *args, **kwargs):
-        super(CloudDirector, self).__init__(*args, **kwargs)
+	super().__init__(*args, **kwargs)
         self.vmTypeDict = {}
         self.vmTypeCECache = {}
         self.vmTypeSlots = {}

src/DIRAC/WorkloadManagementSystem/Agent/PilotSyncAgent.py

@@ -25,7 +25,7 @@ class PilotSyncAgent(AgentModule):
 
     def __init__(self, *args, **kwargs):
         """c'tor"""
-        super(PilotSyncAgent, self).__init__(*args, **kwargs)
+	super().__init__(*args, **kwargs)
 
         # This location would be enough if we are running this agent on the DIRAC web server
         # '/opt/dirac/webRoot/www/pilot'

src/DIRAC/WorkloadManagementSystem/Agent/SiteDirector.py

@@ -51,7 +51,7 @@ class SiteDirector(AgentModule):
 
     def __init__(self, *args, **kwargs):
         """c'tor"""
-        super(SiteDirector, self).__init__(*args, **kwargs)
+	super().__init__(*args, **kwargs)
 
         # on-the fly imports
         ol = ObjectLoader()

src/DIRAC/WorkloadManagementSystem/Agent/StalledJobAgent.py

@@ -33,7 +33,7 @@ class StalledJobAgent(AgentModule):
 
     def __init__(self, *args, **kwargs):
         """c'tor"""
-        super(StalledJobAgent, self).__init__(*args, **kwargs)
+	super().__init__(*args, **kwargs)
 
         self.jobDB = None
         self.logDB = None

src/DIRAC/WorkloadManagementSystem/Agent/__init__.py

@@ -1,8 +1,3 @@
 """
    DIRAC.WorkloadManagementSystem.Agent package
 """
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-__RCSID__ = "$Id$"

src/DIRAC/WorkloadManagementSystem/Client/JobManagerClient.py

@@ -1,9 +1,5 @@
 """ Class that contains client access to the JobManager handler. """
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 from DIRAC.Core.Base.Client import Client, createClient
 
 
@@ -20,7 +16,7 @@ def __init__(self, url=None, **kwargs):
         :param kwargs: forwarded to the Base Client class
         """
 
-        super(JobManagerClient, self).__init__(**kwargs)
+	super().__init__(**kwargs)
 
         if not url:
             self.serverURL = "WorkloadManagement/JobManager"

src/DIRAC/WorkloadManagementSystem/Client/JobMonitoringClient.py

@@ -1,11 +1,5 @@
 """ Class that contains client access to the job monitoring handler. """
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-__RCSID__ = "$Id$"
-
 from DIRAC.Core.Base.Client import Client, createClient
 from DIRAC.Core.Utilities.DEncode import ignoreEncodeWarning
 from DIRAC.Core.Utilities.JEncode import strToIntDict
@@ -16,7 +10,7 @@
 class JobMonitoringClient(Client):
     def __init__(self, **kwargs):
 
-        super(JobMonitoringClient, self).__init__(**kwargs)
+	super().__init__(**kwargs)
         self.setServer("WorkloadManagement/JobMonitoring")
 
     @ignoreEncodeWarning

src/DIRAC/WorkloadManagementSystem/Client/JobReport.py

@@ -1,22 +1,15 @@
 """ JobReport class encapsulates various methods of the job status reporting.
     It's an interface to JobStateUpdateClient, used when bulk submission is needed.
 """
-
-from __future__ import print_function
-from __future__ import absolute_import
-from __future__ import division
-
 from collections import defaultdict
 
 from DIRAC import S_OK, S_ERROR, gLogger
 from DIRAC.Core.Utilities import Time, DEncode
 from DIRAC.RequestManagementSystem.Client.Operation import Operation
 from DIRAC.WorkloadManagementSystem.Client.JobStateUpdateClient import JobStateUpdateClient
 
-__RCSID__ = "$Id$"
-
 
-class JobReport(object):
+class JobReport:
     """
     .. class:: JobReport
     """