!squash more

Author: tony

libtmux/common.py

@@ -58,6 +58,8 @@ class EnvironmentMixin:
 
     _add_option = None
 
+    cmd: t.Callable[[t.Any, t.Any], "tmux_cmd"]
+
     def __init__(self, add_option: Optional[str] = None) -> None:
         self._add_option = add_option
 
@@ -174,12 +176,15 @@ def getenv(self, name: str) -> Optional[str]:
         str
             Value of environment variable
         """
-        tmux_args = ["show-environment"]
+        tmux_args: t.Tuple[t.Union[str, int], ...] = tuple()
+
+        tmux_args += ("show-environment",)
         if self._add_option:
-            tmux_args += [self._add_option]
-        tmux_args += [name]
-        vars = self.cmd(*tmux_args).stdout
-        vars = [tuple(item.split("=", 1)) for item in vars]
+            tmux_args += (self._add_option,)
+        tmux_args += (name,)
+        cmd = self.cmd(*tmux_args)
+        output = cmd.stdout
+        vars = [tuple(item.split("=", 1)) for item in output]
         vars_dict = {}
         for t in vars:
             if len(t) == 2:
@@ -262,17 +267,18 @@ def __init__(self, *args: t.Any, **kwargs: t.Any) -> None:
 
         self.returncode = returncode
 
-        self.stdout = console_to_str(stdout)
-        self.stdout = self.stdout.split("\n")
-        self.stdout = list(filter(None, self.stdout))  # filter empty values
+        stdout_str = console_to_str(stdout)
+        stdout_split = stdout_str.split("\n")
+        stdout_filtered = list(filter(None, stdout_split))  # filter empty values
 
-        self.stderr = console_to_str(stderr)
-        self.stderr = self.stderr.split("\n")
-        self.stderr = list(filter(None, self.stderr))  # filter empty values
+        stderr_str = console_to_str(stderr)
+        stderr_split = stderr_str.split("\n")
+        self.stderr = list(filter(None, stderr_split))  # filter empty values
 
-        if "has-session" in cmd and len(self.stderr):
-            if not self.stdout:
-                self.stdout = self.stderr[0]
+        if "has-session" in cmd and len(self.stderr) and not stdout_filtered:
+            self.stdout = [self.stderr[0]]
+        else:
+            self.stdout = stdout_filtered
 
         logger.debug("self.stdout for {}: \n{}".format(" ".join(cmd), self.stdout))