!squash latest stash commit (misc and WIP RecursionError)

Author: tony

src/libtmux/common.py

@@ -5,6 +5,7 @@
 ~~~~~~~~~~~~~~
 
 """
+import dataclasses
 import logging
 import os
 import re
@@ -320,6 +321,15 @@ def __len__(self) -> int:
         return len(self._info.keys())
 
     def __getattr__(self, key: str) -> str:
+        try:
+            # val = self._info[self.formatter_prefix + key]
+            val = object.__getattribute__(self, key)
+            assert val is not None
+            assert isinstance(val, str)
+            return val
+        except AttributeError:
+            pass
+
         try:
             val = self._info[self.formatter_prefix + key]
             assert val is not None
@@ -405,9 +415,12 @@ def where(self, attrs: D, first: bool = False) -> t.Union[List[O], O]:
 
         # from https://github.com/serkanyersen/underscore.py
         def by(val: O) -> bool:
+            val2: t.Dict[str, str] = {}
+            if dataclasses.is_dataclass(val):
+                val2 = dataclasses.asdict(val)
             for key in attrs.keys():
                 try:
-                    if attrs[key] != val[key]:
+                    if attrs[key] != val[key] and attrs[key] != val2[key]:
                         return False
                 except KeyError:
                     return False

src/libtmux/pane.py

@@ -32,7 +32,10 @@
 
 
 @dataclasses.dataclass
-class Pane(TmuxMappingObject):
+# <<<<<<< HEAD:src/libtmux/pane.py
+# class Pane(TmuxMappingObject):
+# =======
+class Pane:
     """
     A :term:`tmux(1)` :term:`Pane` [pane_manual]_.
 
@@ -118,7 +121,7 @@ class Pane(TmuxMappingObject):
     window_name: str = dataclasses.field(init=True, default="")
     pane_start_command: t.Optional[str] = dataclasses.field(init=True, default=None)
 
-    formatter_prefix = "pane_"
+    formatter_prefix: str = "pane_"
     """Namespace used for :class:`~libtmux.common.TmuxMappingObject`"""
 
     def __post_init__(self, **kwargs: t.Any) -> None:
@@ -129,7 +132,7 @@ def __post_init__(self, **kwargs: t.Any) -> None:
         self.session = self.window.session
         self.server = self.session.server
 
-        self._pane_id = self.pane_id
+        self._pane_id = kwargs.get("pane_id", self.pane_id)
 
         try:
             info = self._info
@@ -157,6 +160,8 @@ def _info(self) -> PaneDict:  # type: ignore  # mypy#1362
 
         # from https://github.com/serkanyersen/underscore.py
         def by(val: PaneDict) -> bool:
+            if dataclasses.is_dataclass(val):
+                val = dataclasses.asdict(val)
             for key in attrs.keys():
                 try:
                     if attrs[key] != val[key]:
@@ -182,7 +187,7 @@ def cmd(self, cmd: str, *args: t.Any, **kwargs: t.Any) -> tmux_cmd:
         :class:`Server.cmd`
         """
         if not any(arg.startswith("-t") for arg in args):
-            args = ("-t", self.get("pane_id")) + args
+            args = ("-t", self.pane_id) + args
 
         return self.server.cmd(cmd, *args, **kwargs)
 
@@ -311,7 +316,7 @@ def split_window(
         :class:`Pane`
         """
         return self.window.split_window(
-            target=self.get("pane_id"),
+            target=self.pane_id,
             start_directory=start_directory,
             attach=attach,
             vertical=vertical,
@@ -410,12 +415,11 @@ def select_pane(self) -> "Pane":
         -------
         :class:`pane`
         """
-        pane = self.window.select_pane(self._pane_id)
-        if pane is None:
-            raise exc.LibTmuxException(f"Pane not found: {self}")
-        return pane
+        # pane = self.window.select_pane(self._pane_id)
+        # if pane is None:
+        #     raise exc.LibTmuxException(f"Pane not found: {self}")
+        # return pane
+        return self.window.select_pane(self.pane_id)
 
     def __repr__(self) -> str:
-        return "{}({} {})".format(
-            self.__class__.__name__, self.get("pane_id"), self.window
-        )
+        return "{}({} {})".format(self.__class__.__name__, self.pane_id, self.window)

tests/test_server.py

@@ -116,7 +116,7 @@ def test_new_session_shell(server: Server) -> None:
     assert mysession.get("session_name") == "test_new_session"
     assert server.has_session("test_new_session")
 
-    pane_start_command = pane.get("pane_start_command")
+    pane_start_command = pane.pane_start_command
     assert pane_start_command is not None
 
     if has_gte_version("3.2"):

tests/test_tmuxobject.py

@@ -34,7 +34,7 @@ def test_find_where(server: Server, session: Session) -> None:
             # window.find_where
             for pane in window.panes:
                 pane_id = pane.get("pane_id")
-                assert pane_id is not None
+                pane_id = pane.pane_id
 
                 assert window.find_where({"pane_id": pane_id}) == pane
                 assert isinstance(window.find_where({"pane_id": pane_id}), Pane)
@@ -84,9 +84,9 @@ def test_find_where_multiple_infos(server: Server, session: Session) -> None:
 
             # window.find_where
             for pane in window.panes:
-                pane_id = pane.get("pane_id")
+                pane_id = pane.pane_id
                 assert pane_id is not None
-                pane_tty = pane.get("pane_tty")
+                pane_tty = pane.pane_tty
                 assert pane_tty is not None
 
                 find_where = window.find_where(
@@ -137,10 +137,10 @@ def test_where(server: Server, session: Session) -> None:
 
             # window.where
             for pane in window.panes:
-                pane_id = pane.get("pane_id")
+                pane_id = pane.pane_id
                 assert pane_id is not None
 
-                pane_tty = pane.get("pane_tty")
+                pane_tty = pane.pane_tty
                 assert pane_tty is not None
 
                 window_panes = window.where({"pane_id": pane_id, "pane_tty": pane_tty})
@@ -181,7 +181,7 @@ def test_get_by_id(server: Server, session: Session) -> None:
 
             # window.get_by_id
             for pane in window.panes:
-                pane_id = pane.get("pane_id")
+                pane_id = pane.pane_id
                 assert pane_id is not None
 
                 get_pane_by_id = window.get_by_id(pane_id)