Skip to content

Commit 79c5e98

Browse files
committed
chore(ruff): Manual fixes for server
1 parent 383a11f commit 79c5e98

File tree

1 file changed

+31
-29
lines changed

1 file changed

+31
-29
lines changed

src/libtmux/server.py

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,9 @@ def is_alive(self) -> bool:
143143
"""
144144
try:
145145
res = self.cmd("list-sessions")
146-
return res.returncode == 0
147146
except Exception:
148147
return False
148+
return res.returncode == 0
149149

150150
def raise_if_dead(self) -> None:
151151
"""Raise if server not connected.
@@ -207,7 +207,7 @@ def cmd(self, *args: t.Any, **kwargs: t.Any) -> tmux_cmd:
207207
elif self.colors == 88:
208208
cmd_args.insert(0, "-8")
209209
else:
210-
raise ValueError("Server.colors must equal 88 or 256")
210+
raise exc.UnknownColorOption()
211211

212212
return tmux_cmd(*cmd_args, **kwargs)
213213

@@ -238,9 +238,9 @@ def attached_sessions(self) -> t.List[Session]:
238238
else:
239239
continue
240240

241-
return attached_sessions
242241
except Exception:
243242
return []
243+
return attached_sessions
244244

245245
def has_session(self, target_session: str, exact: bool = True) -> bool:
246246
"""
@@ -512,7 +512,7 @@ def sessions(self) -> QueryList[Session]: # type:ignore
512512
list_cmd="list-sessions",
513513
server=self,
514514
):
515-
sessions.append(Session(server=self, **obj))
515+
sessions.append(Session(server=self, **obj)) # noqa: PERF401
516516
except Exception:
517517
pass
518518

@@ -526,13 +526,14 @@ def windows(self) -> QueryList[Window]: # type:ignore
526526
:meth:`.windows.get() <libtmux._internal.query_list.QueryList.get()>` and
527527
:meth:`.windows.filter() <libtmux._internal.query_list.QueryList.filter()>`
528528
"""
529-
windows: t.List["Window"] = []
530-
for obj in fetch_objs(
531-
list_cmd="list-windows",
532-
list_extra_args=("-a",),
533-
server=self,
534-
):
535-
windows.append(Window(server=self, **obj))
529+
windows: t.List["Window"] = [
530+
Window(server=self, **obj)
531+
for obj in fetch_objs(
532+
list_cmd="list-windows",
533+
list_extra_args=("-a",),
534+
server=self,
535+
)
536+
]
536537

537538
return QueryList(windows)
538539

@@ -544,13 +545,14 @@ def panes(self) -> QueryList[Pane]: # type:ignore
544545
:meth:`.panes.get() <libtmux._internal.query_list.QueryList.get()>` and
545546
:meth:`.panes.filter() <libtmux._internal.query_list.QueryList.filter()>`
546547
"""
547-
panes: t.List["Pane"] = []
548-
for obj in fetch_objs(
549-
list_cmd="list-panes",
550-
list_extra_args=["-s"],
551-
server=self,
552-
):
553-
panes.append(Pane(server=self, **obj))
548+
panes: t.List["Pane"] = [
549+
Pane(server=self, **obj)
550+
for obj in fetch_objs(
551+
list_cmd="list-panes",
552+
list_extra_args=["-s"],
553+
server=self,
554+
)
555+
]
554556

555557
return QueryList(panes)
556558

@@ -588,7 +590,7 @@ def _list_panes(self) -> t.List[PaneDict]:
588590
589591
.. deprecated:: 0.16
590592
"""
591-
warnings.warn("Server._list_panes() is deprecated")
593+
warnings.warn("Server._list_panes() is deprecated", stacklevel=1)
592594
return [p.__dict__ for p in self.panes]
593595

594596
def _update_panes(self) -> "Server":
@@ -601,22 +603,22 @@ def _update_panes(self) -> "Server":
601603
602604
.. deprecated:: 0.16
603605
"""
604-
warnings.warn("Server._update_panes() is deprecated")
606+
warnings.warn("Server._update_panes() is deprecated", stacklevel=1)
605607
self._list_panes()
606608
return self
607609

608610
def get_by_id(self, id: str) -> t.Optional[Session]:
609611
"""
610612
.. deprecated:: 0.16
611613
"""
612-
warnings.warn("Server.get_by_id() is deprecated")
614+
warnings.warn("Server.get_by_id() is deprecated", stacklevel=1)
613615
return self.sessions.get(session_id=id, default=None)
614616

615617
def where(self, kwargs: t.Dict[str, t.Any]) -> t.List[Session]:
616618
"""
617619
.. deprecated:: 0.16
618620
"""
619-
warnings.warn("Server.find_where() is deprecated")
621+
warnings.warn("Server.find_where() is deprecated", stacklevel=1)
620622
try:
621623
return self.sessions.filter(**kwargs)
622624
except IndexError:
@@ -626,7 +628,7 @@ def find_where(self, kwargs: t.Dict[str, t.Any]) -> t.Optional[Session]:
626628
"""
627629
.. deprecated:: 0.16
628630
"""
629-
warnings.warn("Server.find_where() is deprecated")
631+
warnings.warn("Server.find_where() is deprecated", stacklevel=1)
630632
return self.sessions.get(default=None, **kwargs)
631633

632634
def _list_windows(self) -> t.List[WindowDict]:
@@ -639,15 +641,15 @@ def _list_windows(self) -> t.List[WindowDict]:
639641
640642
.. deprecated:: 0.16
641643
"""
642-
warnings.warn("Server._list_windows() is deprecated")
644+
warnings.warn("Server._list_windows() is deprecated", stacklevel=1)
643645
return [w.__dict__ for w in self.windows]
644646

645647
def _update_windows(self) -> "Server":
646648
"""Update internal window data and return ``self`` for chainability.
647649
648650
.. deprecated:: 0.16
649651
"""
650-
warnings.warn("Server._update_windows() is deprecated")
652+
warnings.warn("Server._update_windows() is deprecated", stacklevel=1)
651653
self._list_windows()
652654
return self
653655

@@ -657,14 +659,14 @@ def _sessions(self) -> t.List[SessionDict]:
657659
658660
.. deprecated:: 0.16
659661
"""
660-
warnings.warn("Server._sessions is deprecated")
662+
warnings.warn("Server._sessions is deprecated", stacklevel=1)
661663
return self._list_sessions()
662664

663665
def _list_sessions(self) -> t.List["SessionDict"]:
664666
"""
665667
.. deprecated:: 0.16
666668
"""
667-
warnings.warn("Server._list_sessions() is deprecated")
669+
warnings.warn("Server._list_sessions() is deprecated", stacklevel=1)
668670
return [s.__dict__ for s in self.sessions]
669671

670672
def list_sessions(self) -> t.List[Session]:
@@ -676,7 +678,7 @@ def list_sessions(self) -> t.List[Session]:
676678
-------
677679
list of :class:`Session`
678680
"""
679-
warnings.warn("Server.list_sessions is deprecated")
681+
warnings.warn("Server.list_sessions is deprecated", stacklevel=1)
680682
return self.sessions
681683

682684
@property
@@ -685,5 +687,5 @@ def children(self) -> QueryList["Session"]: # type:ignore
685687
686688
.. deprecated:: 0.16
687689
"""
688-
warnings.warn("Server.children is deprecated")
690+
warnings.warn("Server.children is deprecated", stacklevel=1)
689691
return self.sessions

0 commit comments

Comments
 (0)