Merge pull request #5926 from fstagni/80_fixes20

[8.0] Removing python2 support from RMS

Author: fstagni

src/DIRAC/ConfigurationSystem/private/TornadoRefresher.py

@@ -1,4 +1,3 @@
-from six import PY3
 import time
 
 from tornado import gen
@@ -74,13 +73,7 @@ def __refreshLoop(self):
             # Publish step is blocking so we have to run it in executor
             # If we are not doing it, when master try to ping we block the IOLoop
 
-            # When switching from python 2 to python 3, the following error occurs:
-            # RuntimeError: There is no current event loop in thread..
-            # The reason seems to be that asyncio.get_event_loop() is called in some thread other than the main thread,
-            # asyncio only generates an event loop for the main thread.
-            yield _IOLoop.current().run_in_executor(
-                None, self.__AutoRefresh if PY3 else gen.coroutine(self.__AutoRefresh)
-            )
+            yield _IOLoop.current().run_in_executor(None, self.__AutoRefresh)
 
     def __AutoRefresh(self):
         """

src/DIRAC/Core/Tornado/Client/private/TornadoBaseClient.py

@@ -28,7 +28,6 @@
 import errno
 import os
 import requests
-import six
 import tempfile
 from http import HTTPStatus
 
@@ -92,7 +91,7 @@ def __init__(self, serviceName, **kwargs):
         :param keepAliveLapse: Duration for keepAliveLapse (heartbeat like)  (now managed by requests)
         """
 
-        if not isinstance(serviceName, six.string_types):
+        if not isinstance(serviceName, str):
             raise TypeError(
                 "Service name expected to be a string. Received %s type %s" % (str(serviceName), type(serviceName))
             )

src/DIRAC/RequestManagementSystem/Client/File.py

@@ -16,7 +16,6 @@
 import datetime
 import os
 import json
-import six
 
 from DIRAC import S_OK, S_ERROR
 from DIRAC.Core.Utilities.File import checkGuid
@@ -69,18 +68,11 @@ def __init__(self, fromDict=None):
         # because of the json initialization or not
         self.initialLoading = True
 
-        fromDict = (
-            fromDict
-            if isinstance(fromDict, dict)
-            else json.loads(fromDict)
-            if isinstance(fromDict, six.string_types)
-            else {}
-        )
+        fromDict = fromDict if isinstance(fromDict, dict) else json.loads(fromDict) if isinstance(fromDict, str) else {}
 
         for attrName, attrValue in fromDict.items():
             # The JSON module forces the use of UTF-8, which is not properly
             # taken into account in DIRAC.
-            # One would need to replace all the '== str' with 'in six.string_types'
             # This is converting `unicode` to `str` and doesn't make sense in Python 3
             if attrValue:
                 setattr(self, attrName, attrValue)
@@ -95,7 +87,7 @@ def LFN(self):
     @LFN.setter
     def LFN(self, value):
         """lfn setter"""
-        if not isinstance(value, six.string_types):
+        if not isinstance(value, str):
             raise TypeError("LFN has to be a string!")
         if not os.path.isabs(value):
             raise ValueError("LFN should be an absolute path!")
@@ -110,7 +102,7 @@ def GUID(self):
     def GUID(self, value):
         """GUID setter"""
         if value:
-            if not isinstance(value, six.string_types):
+            if not isinstance(value, str):
                 raise TypeError("GUID should be a string!")
             if not checkGuid(value):
                 raise ValueError("'%s' is not a valid GUID!" % str(value))

src/DIRAC/RequestManagementSystem/Client/Operation.py

@@ -15,7 +15,6 @@
 # pylint: disable=invalid-name
 import datetime
 import json
-import six
 
 # # from DIRAC
 from DIRAC import S_OK, S_ERROR
@@ -24,7 +23,7 @@
 
 
 ########################################################################
-class Operation(object):
+class Operation:
     """
     :param int OperationID: OperationID as read from DB backend
     :param int RequestID: parent RequestID
@@ -95,7 +94,7 @@ def __init__(self, fromDict=None):
         self.Type = None
         self._Catalog = None
 
-        if isinstance(fromDict, six.string_types):
+        if isinstance(fromDict, str):
             fromDict = json.loads(fromDict)
         elif not isinstance(fromDict, dict):
             fromDict = {}
@@ -223,7 +222,7 @@ def Arguments(self):
 
     @Arguments.setter
     def Arguments(self, value):
-        if isinstance(value, six.text_type):
+        if isinstance(value, str):
             value = value.encode()
         if not isinstance(value, bytes):
             raise TypeError("Arguments should be bytes!")
@@ -237,9 +236,9 @@ def Catalog(self):
     @Catalog.setter
     def Catalog(self, value):
         """catalog setter"""
-        if not isinstance(value, six.string_types + (list,)):
+        if not isinstance(value, (str, list)):
             raise TypeError("wrong type for value")
-        if isinstance(value, six.string_types):
+        if isinstance(value, str):
             value = value.split(",")
 
         value = ",".join(list(set([str(item).strip() for item in value if str(item).strip()])))
@@ -297,9 +296,9 @@ def CreationTime(self):
     @CreationTime.setter
     def CreationTime(self, value=None):
         """creation time setter"""
-        if not isinstance(value, (datetime.datetime,) + six.string_types):
+        if not isinstance(value, (datetime.datetime, str)):
             raise TypeError("CreationTime should be a datetime.datetime!")
-        if isinstance(value, six.string_types):
+        if isinstance(value, str):
             value = datetime.datetime.strptime(value.split(".")[0], self._datetimeFormat)
         self._CreationTime = value
 
@@ -311,9 +310,9 @@ def SubmitTime(self):
     @SubmitTime.setter
     def SubmitTime(self, value=None):
         """submit time setter"""
-        if not isinstance(value, (datetime.datetime,) + six.string_types):
+        if not isinstance(value, (datetime.datetime, str)):
             raise TypeError("SubmitTime should be a datetime.datetime!")
-        if isinstance(value, six.string_types):
+        if isinstance(value, str):
             value = datetime.datetime.strptime(value.split(".")[0], self._datetimeFormat)
         self._SubmitTime = value
 
@@ -325,9 +324,9 @@ def LastUpdate(self):
     @LastUpdate.setter
     def LastUpdate(self, value=None):
         """last update setter"""
-        if not isinstance(value, (datetime.datetime,) + six.string_types):
+        if not isinstance(value, (datetime.datetime, str)):
             raise TypeError("LastUpdate should be a datetime.datetime!")
-        if isinstance(value, six.string_types):
+        if isinstance(value, str):
             value = datetime.datetime.strptime(value.split(".")[0], self._datetimeFormat)
         self._LastUpdate = value
         if self._parent:

src/DIRAC/RequestManagementSystem/Client/ReqClient.py

@@ -5,7 +5,6 @@
   :synopsis: implementation of client for RequestDB using DISET framework
 
 """
-import six
 import os
 import time
 import random
@@ -257,7 +256,7 @@ def getRequestStatus(self, requestID):
         :param self: self reference
         :param int requestID: id of the request
         """
-        if isinstance(requestID, six.string_types):
+        if isinstance(requestID, str):
             requestID = int(requestID)
         self.log.debug("getRequestStatus: attempting to get status for '%d' request." % requestID)
         requestStatus = self._getRPC().getRequestStatus(requestID)
@@ -502,7 +501,7 @@ def prettyPrint(mainItem, key="", offset=0):
         for item in mainItem:
             prettyPrint(item, offset=offset + 2)
         output += "%s%s\n" % (blanks, "]" if isinstance(mainItem, list) else ")")
-    elif isinstance(mainItem, six.string_types):
+    elif isinstance(mainItem, str):
         if "\n" in mainItem:
             prettyPrint(mainItem.strip("\n").split("\n"), offset=offset)
         else:

src/DIRAC/RequestManagementSystem/Client/Request.py

@@ -15,7 +15,6 @@
 # # imports
 import datetime
 import json
-import six
 
 # # from DIRAC
 from DIRAC import S_OK, S_ERROR
@@ -26,7 +25,7 @@
 
 
 ########################################################################
-class Request(object):
+class Request:
     """
     :param int RequestID: requestID
     :param str Name: request' name
@@ -88,7 +87,7 @@ def __init__(self, fromDict=None):
 
         self.__operations__ = []
 
-        if isinstance(fromDict, six.string_types):
+        if isinstance(fromDict, str):
             fromDict = json.loads(fromDict)
         elif not isinstance(fromDict, dict):
             fromDict = {}
@@ -272,7 +271,7 @@ def SourceComponent(self):
 
     @SourceComponent.setter
     def SourceComponent(self, value):
-        if isinstance(value, six.text_type):
+        if isinstance(value, str):
             value = value.encode()
         if not isinstance(value, bytes):
             raise TypeError("SourceComponent should be bytes!")
@@ -286,9 +285,9 @@ def CreationTime(self):
     @CreationTime.setter
     def CreationTime(self, value=None):
         """creation time setter"""
-        if not isinstance(value, (datetime.datetime,) + six.string_types):
+        if not isinstance(value, (datetime.datetime, str)):
             raise TypeError("CreationTime should be a datetime.datetime!")
-        if isinstance(value, six.string_types):
+        if isinstance(value, str):
             value = datetime.datetime.strptime(value.split(".")[0], self._datetimeFormat)
         self._CreationTime = value
 
@@ -300,9 +299,9 @@ def SubmitTime(self):
     @SubmitTime.setter
     def SubmitTime(self, value=None):
         """submission time setter"""
-        if not isinstance(value, (datetime.datetime,) + six.string_types):
+        if not isinstance(value, (datetime.datetime, str)):
             raise TypeError("SubmitTime should be a datetime.datetime!")
-        if isinstance(value, six.string_types):
+        if isinstance(value, str):
             value = datetime.datetime.strptime(value.split(".")[0], self._datetimeFormat)
         self._SubmitTime = value
 
@@ -314,9 +313,9 @@ def NotBefore(self):
     @NotBefore.setter
     def NotBefore(self, value=None):
         """Setter for the NotBefore time"""
-        if not isinstance(value, (type(None), datetime.datetime) + six.string_types):
+        if not isinstance(value, (type(None), datetime.datetime, str)):
             raise TypeError("NotBefore should be a datetime.datetime!")
-        if isinstance(value, six.string_types):
+        if isinstance(value, str):
             value = datetime.datetime.strptime(value.split(".")[0], self._datetimeFormat)
         self._NotBefore = value
 
@@ -340,9 +339,9 @@ def LastUpdate(self):
     @LastUpdate.setter
     def LastUpdate(self, value=None):
         """last update setter"""
-        if not isinstance(value, (datetime.datetime,) + six.string_types):
+        if not isinstance(value, (datetime.datetime, str)):
             raise TypeError("LastUpdate should be a datetime.datetime!")
-        if isinstance(value, six.string_types):
+        if isinstance(value, str):
             value = datetime.datetime.strptime(value.split(".")[0], self._datetimeFormat)
         self._LastUpdate = value
 
@@ -356,7 +355,7 @@ def Status(self):
     def Status(self, value):
         """status setter"""
         if value not in Request.ALL_STATES:
-            raise ValueError("Unknown status: %s" % str(value))
+            raise ValueError(f"Unknown status: {value}")
 
         # If the status moved to Failed or Done, update the lastUpdate time
         if value in ("Done", "Failed"):

src/DIRAC/RequestManagementSystem/Client/test/Test_Request.py

@@ -10,8 +10,6 @@
 
 import datetime
 
-import six
-
 from DIRAC.RequestManagementSystem.Client.Operation import Operation
 from DIRAC.RequestManagementSystem.Client.File import File
 from DIRAC.RequestManagementSystem.Client.Request import Request
@@ -22,7 +20,7 @@ def optimizeRequest(req, printOutput=None):
     from DIRAC import gLogger
 
     if printOutput:
-        if isinstance(printOutput, six.string_types):
+        if isinstance(printOutput, str):
             gLogger.always("Request %s:" % printOutput)
         printRequest(req)
         gLogger.always("=========== Optimized ===============")

src/DIRAC/RequestManagementSystem/DB/RequestDB.py

@@ -15,7 +15,6 @@
 
     db holding Request, Operation and File
 """
-import six
 import errno
 import random
 
@@ -789,7 +788,7 @@ def getRequestIDsForJobs(self, jobIDs):
         self.log.debug("getRequestIDsForJobs: got %s jobIDs to check" % str(jobIDs))
         if not jobIDs:
             return S_ERROR("Must provide jobID list as argument.")
-        if isinstance(jobIDs, six.integer_types):
+        if isinstance(jobIDs, int):
             jobIDs = [jobIDs]
         jobIDs = set(jobIDs)
 
@@ -820,7 +819,7 @@ def readRequestsForJobs(self, jobIDs=None):
         self.log.debug("readRequestForJobs: got %s jobIDs to check" % str(jobIDs))
         if not jobIDs:
             return S_ERROR("Must provide jobID list as argument.")
-        if isinstance(jobIDs, six.integer_types):
+        if isinstance(jobIDs, int):
             jobIDs = [jobIDs]
         jobIDs = set(jobIDs)