!squash cleanup more

Author: tony

src/libtmux/neo.py

@@ -15,7 +15,7 @@
     ListCmd = Literal["list-sessions", "list-windows", "list-panes"]
     ListExtraArgs = t.Optional[t.Tuple[str]]
 
-    from libtmux.common import WindowOptionDict
+    from libtmux.common import WindowDict, WindowOptionDict
     from libtmux.server import Server
 
 logger = logging.getLogger(__name__)
@@ -380,6 +380,25 @@ def attached_window(self) -> "_Window":
         if len(self._windows) == 0:
             raise exc.LibTmuxException("No Windows")
 
+    #
+    # Redundant stuff we want to remove
+    #
+    def _list_windows(self) -> t.List["WindowDict"]:
+        return [w.__dict__ for w in self.windows]
+
+    @property
+    def _windows(self) -> t.List["WindowDict"]:
+        """Property / alias to return :meth:`Session._list_windows`."""
+
+        return self._list_windows()
+
+    def list_windows(self) -> t.List["_Window"]:
+        """Return a list of :class:`Window` from the ``tmux(1)`` session."""
+        return self.windows
+
+    #: Was used by TmuxRelationalObject (but that's longer used in this class)
+    children = windows
+
 
 @dataclasses.dataclass()
 class _Window(Obj):
@@ -769,15 +788,12 @@ def kill_window(self) -> None:
 
         proc = self.cmd(
             "kill-window",
-            # '-t:%s' % self.id
             "-t{}:{}".format(self.session_id, self.window_index),
         )
 
         if proc.stderr:
             raise exc.LibTmuxException(proc.stderr)
 
-        # self.server._update_windows()
-
     def move_window(
         self, destination: str = "", session: t.Optional[str] = None
     ) -> "_Window":