!squash flake8

Author: tony

libtmux/server.py

@@ -24,10 +24,6 @@
 
 logger = logging.getLogger(__name__)
 
-if t.TYPE_CHECKING:
-    from libtmux.common import SessionDict
-    from libtmux.window import Window
-
 
 class Server(TmuxRelationalObject["Session", "SessionDict"], EnvironmentMixin):
 

libtmux/session.py

@@ -7,7 +7,6 @@
 import logging
 import os
 import typing as t
-from typing import Dict, Optional, Union
 
 from libtmux.common import tmux_cmd
 from libtmux.window import Window
@@ -184,7 +183,7 @@ def rename_session(self, new_name: str) -> "Session":
 
     def new_window(
         self,
-        window_name: Optional[str] = None,
+        window_name: t.Optional[str] = None,
         start_directory: None = None,
         attach: bool = True,
         window_index: str = "",
@@ -268,7 +267,7 @@ def new_window(
 
         return window
 
-    def kill_window(self, target_window: Optional[str] = None) -> None:
+    def kill_window(self, target_window: t.Optional[str] = None) -> None:
         """Close a tmux window, and all panes inside it, ``$ tmux kill-window``
 
         Kill the current window or the window at ``target-window``. removing it
@@ -388,7 +387,7 @@ def attached_pane(self) -> t.Optional["Pane"]:
         return self.attached_window.attached_pane
 
     def set_option(
-        self, option: str, value: Union[str, int], _global: bool = False
+        self, option: str, value: t.Union[str, int], _global: bool = False
     ) -> None:
         """
         Set option ``$ tmux set-option <option> <value>``.
@@ -438,8 +437,8 @@ def set_option(
             handle_option_error(proc.stderr[0])
 
     def show_options(
-        self, _global: Optional[bool] = False
-    ) -> t.Dict[str, Union[str, int]]:
+        self, _global: t.Optional[bool] = False
+    ) -> t.Dict[str, t.Union[str, int]]:
         """
         Return a dict of options for the window.
 
@@ -481,7 +480,7 @@ def show_options(
 
     def show_option(
         self, option: str, _global: bool = False
-    ) -> Optional[Union[str, int, bool]]:
+    ) -> t.Optional[t.Union[str, int, bool]]:
         """Return a list of options for the window.
 
         Parameters

libtmux/window.py

@@ -8,7 +8,6 @@
 import os
 import shlex
 import typing as t
-from typing import Dict, Optional, Union
 
 from libtmux.common import tmux_cmd
 from libtmux.pane import Pane
@@ -24,7 +23,6 @@
 )
 
 if t.TYPE_CHECKING:
-    from .common import PaneDict
     from .server import Server
     from .session import Session
 
@@ -122,7 +120,7 @@ def cmd(self, cmd: str, *args: t.Any, **kwargs: t.Any) -> tmux_cmd:
 
         return self.server.cmd(cmd, *args, **kwargs)
 
-    def select_layout(self, layout: Optional[str] = None) -> None:
+    def select_layout(self, layout: t.Optional[str] = None) -> None:
         """Wrapper for ``$ tmux select-layout <layout>``.
 
         Parameters
@@ -161,7 +159,7 @@ def select_layout(self, layout: Optional[str] = None) -> None:
         if proc.stderr:
             raise exc.LibTmuxException(proc.stderr)
 
-    def set_window_option(self, option: str, value: Union[int, str]) -> None:
+    def set_window_option(self, option: str, value: t.Union[int, str]) -> None:
         """
         Wrapper for ``$ tmux set-window-option <option> <value>``.
 
@@ -197,7 +195,7 @@ def set_window_option(self, option: str, value: Union[int, str]) -> None:
         if isinstance(cmd.stderr, list) and len(cmd.stderr):
             handle_option_error(cmd.stderr[0])
 
-    def show_window_options(self, g: Optional[bool] = False) -> WindowOptionDict:
+    def show_window_options(self, g: t.Optional[bool] = False) -> WindowOptionDict:
         """
         Return a dict of options for the window.
 
@@ -244,7 +242,7 @@ def show_window_options(self, g: Optional[bool] = False) -> WindowOptionDict:
 
     def show_window_option(
         self, option: str, g: bool = False
-    ) -> Optional[Union[str, int]]:
+    ) -> t.Optional[t.Union[str, int]]:
         """
         Return a list of options for the window.
 
@@ -330,7 +328,9 @@ def kill_window(self) -> None:
 
         self.server._update_windows()
 
-    def move_window(self, destination: str = "", session: Optional[str] = None) -> None:
+    def move_window(
+        self, destination: str = "", session: t.Optional[str] = None
+    ) -> None:
         """
         Move the current :class:`Window` object ``$ tmux move-window``.
 
@@ -399,12 +399,12 @@ def last_pane(self) -> t.Optional[Pane]:
 
     def split_window(
         self,
-        target: Optional[t.Union[int, str]] = None,
-        start_directory: Optional[str] = None,
+        target: t.Optional[t.Union[int, str]] = None,
+        start_directory: t.Optional[str] = None,
         attach: bool = True,
         vertical: bool = True,
-        shell: Optional[str] = None,
-        percent: Optional[int] = None,
+        shell: t.Optional[str] = None,
+        percent: t.Optional[int] = None,
     ) -> Pane:
         """
         Split window and return the created :class:`Pane`.