fix: removed __RCSID__ lookup

Author: fstagni

src/DIRAC/Core/Base/AgentModule.py

@@ -199,7 +199,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/Script.py

@@ -2,12 +2,6 @@
 
     And don't forget to call parseCommandLine()
 """
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-__RCSID__ = "$Id$"
-
 import sys
 import os.path
 import inspect

src/DIRAC/FrameworkSystem/Client/ProxyGeneration.py

@@ -2,20 +2,14 @@
 # File :   ProxyGeneration.py
 # Author : Adrian Casajus
 ########################################################################
-from __future__ import division
-from __future__ import absolute_import
-from __future__ import print_function
-
 import sys
 from prompt_toolkit import prompt
 from DIRAC import S_OK, S_ERROR, gLogger
 from DIRAC.Core.Utilities.DIRACScript import DIRACScript as Script
 from DIRAC.Core.Utilities.NTP import getClockDeviation
 
-__RCSID__ = "$Id$"
-
 
-class CLIParams(object):
+class CLIParams:
 
     proxyLifeTime = 86400
     diracGroup = False
@@ -204,17 +198,6 @@ def setStrict(self, _arg):
         self.strict = True
         return S_OK()
 
-    def showVersion(self, _arg):
-        """Show version
-
-        :param _arg: unuse
-
-        :return: S_OK()
-        """
-        gLogger.always("Version: %s" % __RCSID__)
-        sys.exit(0)
-        return S_OK()
-
     def disableClockCheck(self, _arg):
         """Disable clock check
 
@@ -240,7 +223,6 @@ def registerCLISwitches(self):
         Script.registerSwitch("u:", "out=", "File to write as proxy", self.setProxyLocation)
         Script.registerSwitch("x", "nocs", "Disable CS check", self.setDisableCSCheck)
         Script.registerSwitch("p", "pwstdin", "Get passwd from stdin", self.setStdinPasswd)
-        Script.registerSwitch("i", "version", "Print version", self.showVersion)
         Script.registerSwitch("j", "noclockcheck", "Disable checking if time is ok", self.disableClockCheck)
         Script.registerSwitch("r", "rfc", "Create an RFC proxy, true by default, deprecated flag", self.setRFC)
         Script.registerSwitch("L", "legacy", "Create a legacy non-RFC proxy", self.setNoRFC)

src/DIRAC/FrameworkSystem/Client/ProxyUpload.py

@@ -3,20 +3,15 @@
 # Author :  Adrian Casajus
 ########################################################################
 
-from __future__ import print_function
-from __future__ import absolute_import
-from __future__ import division
 import sys
 from prompt_toolkit import prompt
 import DIRAC
 
 from DIRAC import gLogger
 from DIRAC.Core.Utilities.DIRACScript import DIRACScript as Script
 
-__RCSID__ = "$Id$"
 
-
-class CLIParams(object):
+class CLIParams:
 
     proxyLifeTime = 2592000
     certLoc = False
@@ -78,12 +73,6 @@ def setStdinPasswd(self, arg):
         self.stdinPasswd = True
         return DIRAC.S_OK()
 
-    def showVersion(self, arg):
-        gLogger.notice("Version:")
-        gLogger.notice(" ", __RCSID__)
-        sys.exit(0)
-        return DIRAC.S_OK()
-
     def registerCLISwitches(self):
         Script.registerSwitch(
             "v:", "valid=", "Valid HH:MM for the proxy. By default is one month", self.setProxyLifeTime
@@ -93,7 +82,6 @@ def registerCLISwitches(self):
         Script.registerSwitch("P:", "Proxy=", "File to use as proxy", self.setProxyLocation)
         Script.registerSwitch("f", "onthefly", "Generate a proxy on the fly", self.setOnTheFly)
         Script.registerSwitch("p", "pwstdin", "Get passwd from stdin", self.setStdinPasswd)
-        Script.registerSwitch("i", "version", "Print version", self.showVersion)
         Script.addDefaultOptionValue("LogLevel", "always")
 
 

src/DIRAC/FrameworkSystem/scripts/dirac_myproxy_upload.py

@@ -3,13 +3,6 @@
 # File :    dirac-proxy-init.py
 # Author :  Adrian Casajus
 ########################################################################
-
-from __future__ import print_function
-from __future__ import absolute_import
-from __future__ import division
-
-__RCSID__ = "$Id$"
-
 import sys
 import DIRAC
 from DIRAC.Core.Utilities.DIRACScript import DIRACScript as Script
@@ -27,20 +20,13 @@ def setDNAsUsername(self, arg):
         self.dnAsUsername = True
         return DIRAC.S_OK()
 
-    def showVersion(self, arg):
-        print("Version:")
-        print(" ", __RCSID__)
-        sys.exit(0)
-        return DIRAC.S_OK()
-
 
 @Script()
 def main():
     params = Params()
 
     Script.registerSwitch("f:", "file=", "File to use as proxy", params.setProxyLocation)
     Script.registerSwitch("D", "DN", "Use DN as myproxy username", params.setDNAsUsername)
-    Script.registerSwitch("i", "version", "Print version", params.showVersion)
 
     Script.addDefaultOptionValue("LogLevel", "always")
     Script.parseCommandLine()

src/DIRAC/FrameworkSystem/scripts/dirac_proxy_info.py

@@ -18,12 +18,6 @@
   VOMS         : True
   VOMS fqan    : ['/formation']
 """
-from __future__ import print_function
-from __future__ import absolute_import
-from __future__ import division
-
-__RCSID__ = "$Id$"
-
 import sys
 
 from DIRAC.Core.Utilities.DIRACScript import DIRACScript as Script
@@ -40,12 +34,6 @@ class Params(object):
     checkClock = True
     uploadedInfo = False
 
-    def showVersion(self, arg):
-        print("Version:")
-        print(" ", __RCSID__)
-        sys.exit(0)
-        return S_OK()
-
     def setProxyLocation(self, arg):
         self.proxyLoc = arg
         return S_OK()
@@ -80,7 +68,6 @@ def main():
     params = Params()
 
     Script.registerSwitch("f:", "file=", "File to use as user key", params.setProxyLocation)
-    Script.registerSwitch("i", "version", "Print version", params.showVersion)
     Script.registerSwitch("n", "novoms", "Disable VOMS", params.disableVOMS)
     Script.registerSwitch("v", "checkvalid", "Return error if the proxy is invalid", params.validityCheck)
     Script.registerSwitch("x", "nocs", "Disable CS", params.disableCS)

src/DIRAC/WorkloadManagementSystem/JobWrapper/JobWrapper.py

@@ -10,13 +10,6 @@
   :caption: JobWrapper options
 
 """
-
-from __future__ import print_function
-from __future__ import absolute_import
-from __future__ import division
-
-__RCSID__ = "$Id$"
-
 import os
 import stat
 import re
@@ -70,7 +63,7 @@
 EXECUTION_RESULT = {}
 
 
-class JobWrapper(object):
+class JobWrapper:
     """The only user of the JobWrapper is the JobWrapperTemplate"""
 
     #############################################################################
@@ -135,7 +128,6 @@ def __init__(self, jobID=None, jobReport=None):
         self.dm = DataManager()
         self.fc = FileCatalog()
         self.log.verbose("===========================================================================")
-        self.log.verbose("Version %s" % (__RCSID__))
         self.log.verbose(self.diracVersion)
         self.currentPID = os.getpid()
         self.log.verbose("Job Wrapper started under PID: %s" % self.currentPID)