fix: WMS Utilities and scripts to py3

Author: fstagni

src/DIRAC/WorkloadManagementSystem/Utilities/JobParameters.py

@@ -1,11 +1,5 @@
 """ DIRAC Workload Management System utility module to get available memory and processors from mjf
 """
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-__RCSID__ = "$Id$"
-
 import os
 import multiprocessing
 from urllib.request import urlopen

src/DIRAC/WorkloadManagementSystem/Utilities/ParametricJob.py

@@ -4,13 +4,6 @@
     getParameterVectorLength() - to get the total size of the bunch of parametric jobs
     generateParametricJobs() - to get a list of expanded descriptions of all the jobs
 """
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-__RCSID__ = "$Id$"
-
-import six
 import re
 
 from DIRAC.Core.Utilities.ClassAd.ClassAdLight import ClassAd
@@ -178,7 +171,7 @@ def generateParametricJobs(jobClassAd):
                 attribute = "Parameter"
             else:
                 attribute = "Parameter.%s" % seqID
-            if isinstance(parameter, six.string_types) and parameter.startswith("{"):
+	    if isinstance(parameter, str) and parameter.startswith("{"):
                 newClassAd.insertAttributeInt(attribute, str(parameter))
             else:
                 newClassAd.insertAttributeString(attribute, str(parameter))

src/DIRAC/WorkloadManagementSystem/Utilities/PilotCStoJSONSynchronizer.py

@@ -4,14 +4,6 @@
   these are incorporated to the file.
   The module uploads to a web server the latest version of the pilot scripts.
 """
-
-from __future__ import print_function
-from __future__ import absolute_import
-from __future__ import division
-
-
-__RCSID__ = "$Id$"
-
 import os
 import glob
 import shutil
@@ -34,7 +26,6 @@ class PilotCStoJSONSynchronizer(object):
     - It updates a JSON file with the values on the CS which can be used by Pilot3 pilots
     - It updates the pilot 3 files
     This synchronizer can be triggered at any time via PilotCStoJSONSynchronizer().sync().
-    As it is today, this is triggered every time there is a successful write on the CS.
     """
 
     def __init__(self):

src/DIRAC/WorkloadManagementSystem/Utilities/QueueUtilities.py

@@ -1,11 +1,5 @@
 """Utilities to help Computing Element Queues manipulation
 """
-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-import six
 import os
 import hashlib
 
@@ -18,8 +12,6 @@
 from DIRAC.Core.Utilities.File import mkDir
 from DIRAC.Resources.Computing.ComputingElementFactory import ComputingElementFactory
 
-__RCSID__ = "$Id$"
-
 
 def getQueuesResolved(
     siteDict, queueCECache, gridEnv=None, setup=None, workingDir="", checkPlatform=False, instantiateCEs=False
@@ -119,10 +111,10 @@ def resolveTags(ceDict, queueDict):
     """
     for tagFieldName in ("Tag", "RequiredTag"):
         ceTags = ceDict.get(tagFieldName, [])
-        if isinstance(ceTags, six.string_types):
+	if isinstance(ceTags, str):
             ceTags = fromChar(ceTags)
         queueTags = queueDict.get(tagFieldName, [])
-        if isinstance(queueTags, six.string_types):
+	if isinstance(queueTags, str):
             queueTags = fromChar(queueTags)
         queueDict[tagFieldName] = list(set(ceTags) | set(queueTags))
 

src/DIRAC/WorkloadManagementSystem/Utilities/Utils.py

@@ -1,14 +1,9 @@
 """ Utilities for WMS
 """
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import io
 import os
 import sys
 import json
-import six
 
 from DIRAC import gConfig, gLogger, S_OK, S_ERROR
 from DIRAC.Core.Utilities.File import mkDir
@@ -30,7 +25,7 @@ def createJobWrapper(
     """This method creates a job wrapper filled with the CE and Job parameters to execute the job.
     Main user is the JobAgent
     """
-    if isinstance(extraOptions, six.string_types) and extraOptions.endswith(".cfg"):
+    if isinstance(extraOptions, str) and extraOptions.endswith(".cfg"):
         extraOptions = "--cfg %s" % extraOptions
 
     arguments = {"Job": jobParams, "CE": resourceParams, "Optimizer": optimizerParams}
@@ -67,7 +62,7 @@ def createJobWrapper(
 
     jobWrapperJsonFile = jobWrapperFile + ".json"
     with io.open(jobWrapperJsonFile, "w", encoding="utf8") as jsonFile:
-        json.dump(six.text_type(arguments), jsonFile, ensure_ascii=False)
+	json.dump(str(arguments), jsonFile, ensure_ascii=False)
 
     with open(jobWrapperFile, "w") as wrapper:
         wrapper.write(wrapperTemplate)
@@ -102,7 +97,7 @@ def createRelocatedJobWrapper(
     """This method creates a job wrapper for a specific job in wrapperPath,
     but assumes this has been reloated to rootLocation before running it.
     """
-    if isinstance(extraOptions, six.string_types) and extraOptions.endswith(".cfg") and "--cfg" not in extraOptions:
+    if isinstance(extraOptions, str) and extraOptions.endswith(".cfg") and "--cfg" not in extraOptions:
         extraOptions = "--cfg %s" % extraOptions
 
     arguments = {"Job": jobParams, "CE": resourceParams, "Optimizer": optimizerParams}
@@ -129,7 +124,7 @@ def createRelocatedJobWrapper(
 
     jobWrapperJsonFile = jobWrapperFile + ".json"
     with io.open(jobWrapperJsonFile, "w", encoding="utf8") as jsonFile:
-        json.dump(six.text_type(arguments), jsonFile, ensure_ascii=False)
+	json.dump(str(arguments), jsonFile, ensure_ascii=False)
 
     with open(jobWrapperFile, "w") as wrapper:
         wrapper.write(wrapperTemplate)

src/DIRAC/WorkloadManagementSystem/scripts/dirac_admin_kill_pilot.py

@@ -6,12 +6,6 @@
 """
 Kill the specified pilot
 """
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-__RCSID__ = "$Id$"
-
 import DIRAC
 from DIRAC.Core.Utilities.DIRACScript import DIRACScript as Script
 

src/DIRAC/WorkloadManagementSystem/scripts/dirac_admin_pilot_logging_info.py

@@ -4,12 +4,6 @@
 
 WARNING: Only one option (either uuid or jobid) should be used.
 """
-from __future__ import print_function
-from __future__ import absolute_import
-from __future__ import division
-
-__RCSID__ = "$Id$"
-
 import DIRAC
 from DIRAC import S_OK, gLogger
 from DIRAC.Core.Utilities.DIRACScript import DIRACScript as Script

src/DIRAC/WorkloadManagementSystem/scripts/dirac_admin_sync_pilot.py

@@ -3,12 +3,6 @@
 This is a simple script that can be used for synchronizing pilot files
 to the current directory.
 """
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-__RCSID__ = "$Id$"
-
 import os
 import json
 import hashlib

src/DIRAC/WorkloadManagementSystem/scripts/dirac_vm_cli.py

@@ -1,8 +1,4 @@
 #!/usr/bin/env python
-from __future__ import print_function
-from __future__ import division
-from __future__ import absolute_import
-
 from DIRAC.Core.Base import Script
 from DIRAC.Core.Utilities.DIRACScript import DIRACScript
 

src/DIRAC/WorkloadManagementSystem/scripts/dirac_vm_endpoint_status.py

@@ -2,13 +2,6 @@
 """
   Get VM instances available in the configured cloud sites
 """
-
-from __future__ import print_function
-from __future__ import division
-from __future__ import absolute_import
-
-__RCSID__ = "$Id$"
-
 from DIRAC import gLogger, exit as DIRACExit
 from DIRAC.Core.Utilities.DIRACScript import DIRACScript as Script