refactor: Run pyupgrade with minimal options

find . -name '*.py' -exec pyupgrade --keep-percent-format --keep-mock --py3-plus {} +

Author: chrisburr

src/WebAppDIRAC/Core/TemplateLoader.py

@@ -1,11 +1,10 @@
 import os
-from io import open
 from tornado.template import BaseLoader, Template
 
 
 class TemplateLoader(BaseLoader):
     def __init__(self, pathList, **kwargs):
-        super(TemplateLoader, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.pathList = pathList
 
     def resolve_path(self, name, parent_path=None):
@@ -18,7 +17,7 @@ def _create_template(self, name):
         for path in self.pathList:
             try:
                 f = open(os.path.abspath(os.path.join(path, name)), "rb")
-            except IOError:
+            except OSError:
                 continue
             template = Template(f.read(), name=name, loader=self)
             f.close()

src/WebAppDIRAC/Lib/Conf.py

@@ -184,7 +184,7 @@ def generateCAFile():
             fn = tempfile.mkstemp(prefix="cas.", suffix=".pem")[1]
         try:
             fd = open(fn, "w")
-        except IOError:
+        except OSError:
             continue
         for caFile in os.listdir(caDir):
             caFile = os.path.join(caDir, caFile)
@@ -216,7 +216,7 @@ def generateRevokedCertsFile():
             fn = tempfile.mkstemp(prefix="allRevokedCerts", suffix=".pem")[1]
         try:
             fd = open(fn, "w")
-        except IOError:
+        except OSError:
             continue
         for caFile in os.listdir(caDir):
             caFile = os.path.join(caDir, caFile)

src/WebAppDIRAC/WebApp/handler/JobSummaryHandler.py

@@ -268,21 +268,21 @@ def web_getSelectionData(self):
         if result["OK"]:
             result = result["Value"]
             if len(result.get("Status", [])) > 0:
-                status = [[str("All")]]
+                status = [["All"]]
                 for i in result["Status"]:
                     status.append([str(i)])
             else:
                 status = [["Nothing to display"]]
             callback["status"] = status
             if len(result.get("GridType", [])) > 0:
-                gridtype = [[str("All")]]
+                gridtype = [["All"]]
                 for i in result["GridType"]:
                     gridtype.append([str(i)])
             else:
                 gridtype = [["Nothing to display"]]
             callback["gridtype"] = gridtype
             if len(result.get("MaskStatus", [])) > 0:
-                maskstatus = [[str("All")]]
+                maskstatus = [["All"]]
                 for i in result["MaskStatus"]:
                     maskstatus.append([str(i)])
             else:

src/WebAppDIRAC/WebApp/handler/ResourceSummaryHandler.py

@@ -33,7 +33,7 @@ def _getSelectionData(self, **kwargs) -> dict:
 
         for key, value in callback.items():
 
-            callback[key] = sorted([[item] for item in list(value)])
+            callback[key] = sorted([item] for item in list(value))
             callback[key] = [["All"]] + callback[key]
 
         return callback
@@ -54,7 +54,7 @@ def combine(self, elementValues: list) -> dict:
 
         else:
 
-            if set(["Active", "Degraded"]) & set(statusSet):
+            if {"Active", "Degraded"} & set(statusSet):
                 status = "Degraded"
                 reason = "Not completely active"
 

src/WebAppDIRAC/WebApp/handler/RootHandler.py

@@ -173,7 +173,7 @@ def web_index(self, *, url_state="", theme="crisp", open_app="", **kwargs):
         welcomeFile = Conf.getWelcome()
         if welcomeFile:
             try:
-                with open(welcomeFile, "r") as f:
+                with open(welcomeFile) as f:
                     welcome = f.read().replace("\n", "")
             except Exception:
                 gLogger.warn("Welcome page not found here: %s" % welcomeFile)

src/WebAppDIRAC/WebApp/handler/SystemAdministrationHandler.py

@@ -142,7 +142,7 @@ def web_hostAction(self, host=None, action=None, version=None):
                 str(_host), None, delegatedDN=self.getUserDN(), delegatedGroup=self.getUserGroup()
             )
             if action == "restart":
-                result = client.restartComponent(str("*"), str("*"))
+                result = client.restartComponent("*", "*")
             elif action == "revert":
                 result = client.revertSoftware()
             elif action == "update":

src/WebAppDIRAC/WebApp/handler/UPHandler.py

@@ -200,7 +200,7 @@ def web_changeView(self, obj, app, desktop, view):
             return result
         data = result["Value"]
         oDesktop = json.loads(DEncode.decode(zlib.decompress(base64.b64decode(data)))[0])
-        oDesktop[str("view")] = str(view)
+        oDesktop["view"] = str(view)
         oDesktop = json.dumps(oDesktop)
         data = base64.b64encode(zlib.compress(DEncode.encode(oDesktop), 9))
         return up.storeVar(desktop, data)