!squash latest stash commit (misc and WIP RecursionError)

Author: tony

libtmux/common.py

@@ -5,6 +5,7 @@
 ~~~~~~~~~~~~~~
 
 """
+import dataclasses
 import logging
 import os
 import re
@@ -274,6 +275,11 @@ def __len__(self):
         return len(self._info.keys())
 
     def __getattr__(self, key):
+        try:
+            return object.__getattribute__(self, key)
+        except AttributeError:
+            pass
+
         try:
             return self._info[self.formatter_prefix + key]
         except KeyError:
@@ -338,9 +344,12 @@ def where(self, attrs, first=False):
 
         # from https://github.com/serkanyersen/underscore.py
         def by(val) -> bool:
+            val2 = {}
+            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

libtmux/pane.py

@@ -24,7 +24,7 @@
 
 
 @dataclasses.dataclass
-class Pane(TmuxMappingObject, TmuxRelationalObject):
+class Pane:
     """
     A :term:`tmux(1)` :term:`Pane` [pane_manual]_.
 
@@ -97,7 +97,7 @@ class Pane(TmuxMappingObject, TmuxRelationalObject):
     pane_start_command: Optional[str] = dataclasses.field(init=True, default=None)
 
     #: namespace used :class:`~libtmux.common.TmuxMappingObject`
-    formatter_prefix = "pane_"
+    formatter_prefix: str = "pane_"
 
     def __post_init__(self, **kwargs):
         # if not window:
@@ -107,7 +107,7 @@ def __post_init__(self, **kwargs):
         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
@@ -135,6 +135,8 @@ def _info(self):
 
         # from https://github.com/serkanyersen/underscore.py
         def by(val) -> bool:
+            if dataclasses.is_dataclass(val):
+                val = dataclasses.asdict(val)
             for key in attrs.keys():
                 try:
                     if attrs[key] != val[key]:
@@ -160,7 +162,7 @@ def cmd(self, cmd, *args, **kwargs):
         :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)
 
@@ -247,7 +249,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,
@@ -347,9 +349,7 @@ def select_pane(self) -> "Pane":
         -------
         :class:`pane`
         """
-        return self.window.select_pane(self.get("pane_id"))
+        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

@@ -100,6 +100,6 @@ def test_new_session_shell(server):
     assert server.has_session("test_new_session")
 
     if has_gte_version("3.2"):
-        assert pane.get("pane_start_command").replace('"', "") == cmd
+        assert pane.pane_start_command.replace('"', "") == cmd
     else:
-        assert pane.get("pane_start_command") == cmd
+        assert pane.pane_start_command == cmd

tests/test_tmuxobject.py

@@ -28,7 +28,7 @@ def test_find_where(server, session):
 
             # window.find_where
             for pane in window.panes:
-                pane_id = pane.get("pane_id")
+                pane_id = pane.pane_id
 
                 assert window.find_where({"pane_id": pane_id}) == pane
                 assert isinstance(window.find_where({"pane_id": pane_id}), Pane)
@@ -73,8 +73,8 @@ def test_find_where_multiple_infos(server, session):
 
             # window.find_where
             for pane in window.panes:
-                pane_id = pane.get("pane_id")
-                pane_tty = pane.get("pane_tty")
+                pane_id = pane.pane_id
+                pane_tty = pane.pane_tty
 
                 find_where = window.find_where(
                     {"pane_id": pane_id, "pane_tty": pane_tty}
@@ -116,8 +116,8 @@ def test_where(server, session):
 
             # window.where
             for pane in window.panes:
-                pane_id = pane.get("pane_id")
-                pane_tty = pane.get("pane_tty")
+                pane_id = pane.pane_id
+                pane_tty = pane.pane_tty
 
                 where = window.where({"pane_id": pane_id, "pane_tty": pane_tty})
 
@@ -155,7 +155,7 @@ def test_get_by_id(server, session):
 
             # window.get_by_id
             for pane in window.panes:
-                pane_id = pane.get("pane_id")
+                pane_id = pane.pane_id
 
                 get_by_id = window.get_by_id(pane_id)