Python code modernization, 4/n (#1162)

* Address attribute-defined-outside-init.

* Address broad-exception-raised.

* Address broad-exception-caught.

* Address consider-iterating-dictionary.

* Address consider-using-dict-comprehension.

* Address consider-using-f-string.

* Address consider-using-in.

* Address consider-using-max-builtin.

* Address some consider-using-with.

* Address invalid-name.

* Address keyword-arg-before-vararg.

* Address line-too-long.

* Address no-else-continue.

* Address no-else-raise.

* Address no-else-return.

* Remove broken dead code.

* Make consider-using-f-string changes compatible with older Python versions.

* Python 3.11 and earlier apparently do not like multi-line f-strings.

plugins/module_utils/_api/context/config.py

@@ -36,7 +36,7 @@ def get_current_context_name_with_source():
                     json.load(f).get("currentContext", "default"),
                     f"configuration file {docker_cfg_path}",
                 )
-        except Exception:
+        except Exception:  # pylint: disable=broad-exception-caught
             pass
     return "default", "fallback value"
 
@@ -54,7 +54,7 @@ def write_context_name_to_docker_config(name=None):
         try:
             with open(docker_cfg_path, "rt", encoding="utf-8") as f:
                 config = json.load(f)
-        except Exception as e:
+        except Exception as e:  # pylint: disable=broad-exception-caught
             return e
     current_context = config.get("currentContext", None)
     if current_context and not name:
@@ -68,7 +68,7 @@ def write_context_name_to_docker_config(name=None):
     try:
         with open(docker_cfg_path, "wt", encoding="utf-8") as f:
             json.dump(config, f, indent=4)
-    except Exception as e:
+    except Exception as e:  # pylint: disable=broad-exception-caught
         return e
 
 

plugins/module_utils/_api/context/context.py

@@ -42,7 +42,7 @@ class Context:
         description=None,
     ):
         if not name:
-            raise Exception("Name not provided")
+            raise ValueError("Name not provided")
         self.name = name
         self.context_type = None
         self.orchestrator = orchestrator
@@ -136,7 +136,7 @@ class Context:
                 metadata = json.load(f)
         except (OSError, KeyError, ValueError) as e:
             # unknown format
-            raise Exception(
+            raise RuntimeError(
                 f"Detected corrupted meta file for context {name} : {e}"
             ) from e
 
@@ -157,7 +157,7 @@ class Context:
     def _load_certs(self):
         certs = {}
         tls_dir = get_tls_dir(self.name)
-        for endpoint in self.endpoints.keys():
+        for endpoint in self.endpoints:
             if not os.path.isdir(os.path.join(tls_dir, endpoint)):
                 continue
             ca_cert = None
@@ -238,11 +238,11 @@ class Context:
         return self.context_type is None
 
     @property
-    def Name(self):
+    def Name(self):  # pylint: disable=invalid-name
         return self.name
 
     @property
-    def Host(self):
+    def Host(self):  # pylint: disable=invalid-name
         if not self.orchestrator or self.orchestrator == "swarm":
             endpoint = self.endpoints.get("docker", None)
             if endpoint:
@@ -252,27 +252,27 @@ class Context:
         return self.endpoints[self.orchestrator].get("Host", None)
 
     @property
-    def Orchestrator(self):
+    def Orchestrator(self):  # pylint: disable=invalid-name
         return self.orchestrator
 
     @property
-    def Metadata(self):
+    def Metadata(self):  # pylint: disable=invalid-name
         meta = {}
         if self.orchestrator:
             meta = {"StackOrchestrator": self.orchestrator}
         return {"Name": self.name, "Metadata": meta, "Endpoints": self.endpoints}
 
     @property
-    def TLSConfig(self):
+    def TLSConfig(self):  # pylint: disable=invalid-name
         key = self.orchestrator
         if not key or key == "swarm":
             key = "docker"
-        if key in self.tls_cfg.keys():
+        if key in self.tls_cfg:
             return self.tls_cfg[key]
         return None
 
     @property
-    def TLSMaterial(self):
+    def TLSMaterial(self):  # pylint: disable=invalid-name
         certs = {}
         for endpoint, tls in self.tls_cfg.items():
             cert, key = tls.cert
@@ -280,5 +280,5 @@ class Context:
         return {"TLSMaterial": certs}
 
     @property
-    def Storage(self):
+    def Storage(self):  # pylint: disable=invalid-name
         return {"Storage": {"MetadataPath": self.meta_path, "TLSPath": self.tls_path}}