Merge pull request #5694 from fstagni/80_fixes6

[8.0] do no look anymore for __RCSID__ (and many other py3 fixes)

Author: fstagni

src/DIRAC/Core/Base/API.py

@@ -1,9 +1,5 @@
 """ DIRAC API Base Class """
 
-from __future__ import print_function
-from __future__ import absolute_import
-from __future__ import division
-
 import pprint
 import sys
 
@@ -13,8 +9,6 @@
 from DIRAC.ConfigurationSystem.Client.Helpers.Registry import getDNForUsername
 from DIRAC.ConfigurationSystem.Client.Helpers.Resources import getSites
 
-__RCSID__ = "$Id$"
-
 COMPONENT_NAME = "API"
 
 
@@ -58,7 +52,7 @@ def _printFormattedDictList(dictList, fields, uniqueField, orderBy):
 # TODO: some of these can just be functions, and moved out of here
 
 
-class API(object):
+class API:
     """An utilities class for APIs"""
 
     #############################################################################

src/DIRAC/Core/Base/AgentModule.py

@@ -5,16 +5,12 @@
 """
   Base class for all agent modules
 """
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-__RCSID__ = "$Id$"
-
 import os
 import threading
 import time
 import signal
+import importlib
+import inspect
 
 import DIRAC
 from DIRAC import S_OK, S_ERROR, gConfig, gLogger, rootPath
@@ -29,7 +25,7 @@
 from DIRAC.ConfigurationSystem.Client.Helpers.Operations import Operations
 
 
-class AgentModule(object):
+class AgentModule:
     """Base class for all agent modules
 
     This class is used by the AgentReactor Class to steer the execution of
@@ -71,9 +67,8 @@ class AgentModule(object):
     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:
@@ -154,18 +149,23 @@ def __init__(self, agentName, loadName, baseAgentName=False, properties={}):
         self.__initialized = False
 
     def __getCodeInfo(self):
-        versionVar = "__RCSID__"
-        docVar = "__doc__"
+
         try:
-            self.__agentModule = __import__(self.__class__.__module__, globals(), locals(), versionVar)
+            self.__codeProperties["version"] = importlib.metadata.version(
+                inspect.getmodule(self).__package__.split(".")[0]
+            )
+        except Exception:
+            self.log.exception(f"Failed to find version for {self!r}")
+            self.__codeProperties["version"] = "unset"
+        try:
+            self.__agentModule = __import__(self.__class__.__module__, globals(), locals(), "__doc__")
         except Exception as excp:
             self.log.exception("Cannot load agent module", lException=excp)
-        for prop in ((versionVar, "version"), (docVar, "description")):
-            try:
-                self.__codeProperties[prop[1]] = getattr(self.__agentModule, prop[0])
-            except Exception:
-                self.log.error("Missing property", prop[0])
-                self.__codeProperties[prop[1]] = "unset"
+        try:
+            self.__codeProperties["description"] = getattr(self.__agentModule, "__doc__")
+        except Exception:
+            self.log.error("Missing property __doc__")
+            self.__codeProperties["description"] = "unset"
         self.__codeProperties["DIRACVersion"] = DIRAC.version
         self.__codeProperties["platform"] = DIRAC.getPlatform()
 
@@ -198,7 +198,6 @@ def am_initialize(self, *initArgs):
         self.log.notice("Loaded agent module %s" % self.__moduleProperties["fullName"])
         self.log.notice(" Site: %s" % DIRAC.siteName())
         self.log.notice(" Setup: %s" % gConfig.getValue("/DIRAC/Setup"))
-        self.log.notice(" Base Module version: %s " % __RCSID__)
         self.log.notice(" Agent version: %s" % self.__codeProperties["version"])
         self.log.notice(" DIRAC version: %s" % DIRAC.version)
         self.log.notice(" DIRAC platform: %s" % DIRAC.getPlatform())

src/DIRAC/Core/Base/AgentReactor.py

@@ -24,9 +24,6 @@
   must inherit from the base class AgentModule
 
 """
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
 import time
 
 from DIRAC import S_OK, S_ERROR, gLogger
@@ -35,10 +32,8 @@
 from DIRAC.Core.Utilities import ThreadScheduler
 from DIRAC.Core.Base.AgentModule import AgentModule
 
-__RCSID__ = "$Id$"
 
-
-class AgentReactor(object):
+class AgentReactor:
     """
     Main interface to DIRAC Agents. It allows to :
     - define a Agents modules to be executed

src/DIRAC/Core/Base/CLI.py

@@ -7,12 +7,6 @@
     several utilities and signal handlers of general purpose.
 """
 
-from __future__ import print_function
-from __future__ import absolute_import
-from __future__ import division
-
-__RCSID__ = "$Id$"
-
 import cmd
 import sys
 import os

src/DIRAC/Core/Base/Client.py

@@ -2,12 +2,6 @@
 
     This class exposes possible RPC calls, given a url of a service.
 """
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-__RCSID__ = "$Id$"
-
 import ast
 from functools import partial
 
@@ -40,7 +34,7 @@ def __get__(self, instance, owner):
         return func
 
 
-class Client(object):
+class Client:
     """Simple class to redirect unknown actions directly to the server. Arguments
     to the constructor are passed to the RPCClient constructor as they are.
     Some of them can however be overwritten at each call (url and timeout).

src/DIRAC/Core/Base/DB.py

@@ -1,16 +1,10 @@
 """ DB is a base class for multiple DIRAC databases that are based on MySQL.
     It uniforms the way the database objects are constructed
 """
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 from DIRAC.Core.Base.DIRACDB import DIRACDB
 from DIRAC.Core.Utilities.MySQL import MySQL
 from DIRAC.ConfigurationSystem.Client.Utilities import getDBParameters
 
-__RCSID__ = "$Id$"
-
 
 class DB(DIRACDB, MySQL):
     """All DIRAC DB classes should inherit from this one (unless using sqlalchemy)"""

src/DIRAC/Core/Base/DIRACDB.py

@@ -6,7 +6,7 @@
 from DIRAC.ConfigurationSystem.Client.PathFinder import getDatabaseSection
 
 
-class DIRACDB(object):
+class DIRACDB:
     """Extended in DB, SQLAlchemyDB, ElasticDB"""
 
     def __init__(self, *args, **kwargs):

src/DIRAC/Core/Base/ElasticDB.py

@@ -1,11 +1,5 @@
 """ ElasticDB is a base class used to connect an Elasticsearch database and manages queries.
 """
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-__RCSID__ = "$Id$"
-
 from DIRAC.Core.Base.DIRACDB import DIRACDB
 from DIRAC.Core.Utilities.ElasticSearchDB import ElasticSearchDB
 from DIRAC.ConfigurationSystem.Client.Utilities import getElasticDBParameters

src/DIRAC/Core/Base/ExecutorModule.py

@@ -2,20 +2,14 @@
 
     Just provides a number of functions used by all executors
 """
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import os
 from DIRAC import S_OK, S_ERROR, gConfig, gLogger, rootPath
 from DIRAC.ConfigurationSystem.Client import PathFinder
 from DIRAC.Core.Utilities.Shifter import setupShifterProxyInEnv
 from DIRAC.Core.Utilities.ReturnValues import isReturnStructure
 
-__RCSID__ = "$Id$"
-
 
-class ExecutorModule(object):
+class ExecutorModule:
     """All executors should inherit from this module"""
 
     @classmethod

src/DIRAC/Core/Base/ExecutorReactor.py

@@ -20,10 +20,6 @@
   must inherit from the base class ExecutorModule
 
 """
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import time
 import threading
 from DIRAC import S_OK, S_ERROR, gLogger
@@ -32,11 +28,9 @@
 from DIRAC.Core.Base.private.ModuleLoader import ModuleLoader
 from DIRAC.Core.Base.ExecutorModule import ExecutorModule
 
-__RCSID__ = "$Id$"
-
 
-class ExecutorReactor(object):
-    class AliveLock(object):
+class ExecutorReactor:
+    class AliveLock:
         def __init__(self):
             self.__alive = 0
             self.__cond = threading.Condition(threading.Lock())
@@ -60,7 +54,7 @@ def lockUntilAllDead(self):
                 self.__cond.wait(1)
             self.__cond.release()
 
-    class MindCluster(object):
+    class MindCluster:
         def __init__(self, mindName, aliveLock):
             self.__mindName = mindName
             self.__modules = {}