fix: change annotation from S_OK to dict, minor fixes

minor fixes

fix: Update src/DIRAC/FrameworkSystem/scripts/dirac_login.py

fix: Update src/DIRAC/FrameworkSystem/scripts/dirac_login.py

fix: Update src/DIRAC/FrameworkSystem/scripts/dirac_login.py
Co-Authored-By: fstagni <[email protected]>

Author: TaykYoku

src/DIRAC/FrameworkSystem/scripts/dirac_login.py

@@ -38,7 +38,7 @@
 )
 
 
-class Params(object):
+class Params:
     """This class describes the input parameters"""
 
     def __init__(self):
@@ -54,15 +54,15 @@ def __init__(self):
         self.authWith = "certificate"
         self.enableCS = True
 
-    def disableCS(self, _arg) -> S_OK:
+    def disableCS(self, _arg) -> dict:
         """Set issuer
 
         :param arg: issuer
         """
         self.enableCS = False
         return S_OK()
 
-    def setIssuer(self, arg: str) -> S_OK:
+    def setIssuer(self, arg: str) -> dict:
         """Set issuer
 
         :param arg: issuer
@@ -71,15 +71,15 @@ def setIssuer(self, arg: str) -> S_OK:
         self.issuer = arg
         return S_OK()
 
-    def useDIRACAS(self, _arg) -> S_OK:
+    def useDIRACAS(self, _arg) -> dict:
         """Use DIRAC AS
 
         :param _arg: unuse
         """
         self.authWith = "diracas"
         return S_OK()
 
-    def useCertificate(self, _arg) -> S_OK:
+    def useCertificate(self, _arg) -> dict:
         """Use certificate
 
         :param _arg: unuse
@@ -89,19 +89,19 @@ def useCertificate(self, _arg) -> S_OK:
         self.result = "proxy"
         return S_OK()
 
-    def setCertificate(self, arg: str) -> S_OK:
+    def setCertificate(self, arg: str) -> dict:
         """Set certificate file path
 
         :param arg: path
         """
         if not os.path.exists(arg):
-            DIRAC.gLogger.error(f"{arg} is not exist.")
+            DIRAC.gLogger.error(f"{arg} does not exist.")
             DIRAC.exit(1)
         self.useCertificate(None)
         self.certLoc = arg
         return S_OK()
 
-    def setPrivateKey(self, arg: str) -> S_OK:
+    def setPrivateKey(self, arg: str) -> dict:
         """Set private key file path
 
         :param arg: path
@@ -113,23 +113,23 @@ def setPrivateKey(self, arg: str) -> S_OK:
         self.keyLoc = arg
         return S_OK()
 
-    def setOutputFile(self, arg: str) -> S_OK:
+    def setOutputFile(self, arg: str) -> dict:
         """Set output file location
 
         :param arg: output file location
         """
         self.outputFile = arg
         return S_OK()
 
-    def setLivetime(self, arg: str) -> S_OK:
-        """Set proxy livetime
+    def setLifetime(self, arg: str) -> dict:
+        """Set proxy lifetime
 
         :param arg: lifetime
         """
         self.lifetime = arg
         return S_OK()
 
-    def setProxy(self, _arg) -> S_OK:
+    def setProxy(self, _arg) -> dict:
         """Return proxy
 
         :param _arg: unuse
@@ -138,7 +138,7 @@ def setProxy(self, _arg) -> S_OK:
         self.result = "proxy"
         return S_OK()
 
-    def setToken(self, _arg) -> S_OK:
+    def setToken(self, _arg) -> dict:
         """Return tokens
 
         :param _arg: unuse
@@ -148,7 +148,7 @@ def setToken(self, _arg) -> S_OK:
         self.result = "token"
         return S_OK()
 
-    def authStatus(self, _arg) -> S_OK:
+    def authStatus(self, _arg) -> dict:
         """Get authorization status
 
         :param _arg: unuse
@@ -166,7 +166,7 @@ def registerCLISwitches(self):
             "group: select a DIRAC group for authorization, can be determined later.", mandatory=False
         )
         Script.registerArgument(["scope: scope to add to authorization request."], mandatory=False)
-        Script.registerSwitch("T:", "lifetime=", "set access lifetime in a hours", self.setLivetime)
+        Script.registerSwitch("T:", "lifetime=", "set access lifetime in hours", self.setLifetime)
         Script.registerSwitch(
             "O:",
             "save-output=",

src/DIRAC/FrameworkSystem/scripts/dirac_logout.py

@@ -21,20 +21,20 @@
 )
 
 
-class Params(object):
+class Params:
     def __init__(self):
         self.issuer = None
         self.targetFile = None
 
-    def setIssuer(self, arg: str) -> S_OK:
+    def setIssuer(self, arg: str) -> dict:
         """Set issuer
 
         :param arg: issuer
         """
         self.issuer = arg
         return S_OK()
 
-    def setFile(self, arg: str) -> S_OK:
+    def setFile(self, arg: str) -> dict:
         """Set token/proxy file
 
         :param arg: token file