Merge pull request #6501 from kreczko/kreczko-removing-pre-python2.5-syntax

[integration] replace pre-Python 2.5 ternary syntax

Author: fstagni

src/DIRAC/FrameworkSystem/DB/ProxyDB.py

@@ -308,7 +308,7 @@ def __storeProxy(self, userDN, chain, proxyProvider=None):
             result = Registry.getProxyProvidersForDN(userDN)
             if not result["OK"]:
                 return result
-            proxyProvider = result.get("Value") and result["Value"][0] or "Certificate"
+            proxyProvider = result["Value"][0] if result.get("Value") else "Certificate"
 
         # Get remaining secs
         retVal = chain.getRemainingSecs()

src/DIRAC/ResourceStatusSystem/Command/Command.py

@@ -12,13 +12,13 @@ class Command:
 
     def __init__(self, args=None, clients=None):
 
-        self.apis = (1 and clients) or {}
+        self.apis = clients if clients else {}
         self.masterMode = False
         self.onlyCache = False
         self.metrics = {"failed": []}
 
         self.args = {"onlyCache": False}
-        _args = (1 and args) or {}
+        _args = args if args else {}
         self.args.update(_args)
         self.log = gLogger.getSubLogger(self.__class__.__name__)
 

src/DIRAC/ResourceStatusSystem/Utilities/RSSCache.py

@@ -24,7 +24,7 @@ def __init__(self, lifeTime, updateFunc=None, cacheHistoryLifeTime=None):
 
         self.__lifeTime = lifeTime
         # lifetime of the history on hours
-        self.__cacheHistoryLifeTime = (1 and cacheHistoryLifeTime) or 24
+        self.__cacheHistoryLifeTime = cacheHistoryLifeTime if cacheHistoryLifeTime else 24
         self.__updateFunc = updateFunc
 
         # RSSCache