ruff format (after adding flake8-commas)

Author: tony

conftest.py

@@ -59,7 +59,8 @@ def tmuxp_configdir(user_path: pathlib.Path) -> pathlib.Path:
 
 @pytest.fixture
 def tmuxp_configdir_default(
-    monkeypatch: pytest.MonkeyPatch, tmuxp_configdir: pathlib.Path,
+    monkeypatch: pytest.MonkeyPatch,
+    tmuxp_configdir: pathlib.Path,
 ) -> None:
     """Set tmuxp configuration directory for ``TMUXP_CONFIGDIR``."""
     monkeypatch.setenv("TMUXP_CONFIGDIR", str(tmuxp_configdir))

docs/_ext/aafig.py

@@ -38,7 +38,8 @@
 
 
 def merge_dict(
-    dst: t.Dict[str, t.Optional[str]], src: t.Dict[str, t.Optional[str]],
+    dst: t.Dict[str, t.Optional[str]],
+    src: t.Dict[str, t.Optional[str]],
 ) -> t.Dict[str, t.Optional[str]]:
     for k, v in src.items():
         if k not in dst:
@@ -47,7 +48,9 @@ def merge_dict(
 
 
 def get_basename(
-    text: str, options: t.Dict[str, str], prefix: t.Optional[str] = "aafig",
+    text: str,
+    options: t.Dict[str, str],
+    prefix: t.Optional[str] = "aafig",
 ) -> str:
     options = options.copy()
     if "format" in options:
@@ -152,7 +155,9 @@ def __init__(self, *args: object, **kwargs: object) -> None:
 
 
 def render_aafigure(
-    app: "Sphinx", text: str, options: t.Dict[str, str],
+    app: "Sphinx",
+    text: str,
+    options: t.Dict[str, str],
 ) -> t.Tuple[str, str, t.Optional[str], t.Optional[str]]:
     """Render an ASCII art figure into the requested format output file."""
     if aafigure is None:

src/tmuxp/cli/__init__.py

@@ -34,7 +34,14 @@
 
     CLIVerbosity: TypeAlias = t.Literal["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"]
     CLISubparserName: TypeAlias = t.Literal[
-        "ls", "load", "freeze", "convert", "edit", "import", "shell", "debug-info",
+        "ls",
+        "load",
+        "freeze",
+        "convert",
+        "edit",
+        "import",
+        "shell",
+        "debug-info",
     ]
     CLIImportSubparserName: TypeAlias = t.Literal["teamocil", "tmuxinator"]
 
@@ -60,21 +67,25 @@ def create_parser() -> argparse.ArgumentParser:
     load_parser = subparsers.add_parser("load", help="load tmuxp workspaces")
     create_load_subparser(load_parser)
     shell_parser = subparsers.add_parser(
-        "shell", help="launch python shell for tmux server, session, window and pane",
+        "shell",
+        help="launch python shell for tmux server, session, window and pane",
     )
     create_shell_subparser(shell_parser)
     import_parser = subparsers.add_parser(
-        "import", help="import workspaces from teamocil and tmuxinator.",
+        "import",
+        help="import workspaces from teamocil and tmuxinator.",
     )
     create_import_subparser(import_parser)
 
     convert_parser = subparsers.add_parser(
-        "convert", help="convert workspace files between yaml and json.",
+        "convert",
+        help="convert workspace files between yaml and json.",
     )
     create_convert_subparser(convert_parser)
 
     debug_info_parser = subparsers.add_parser(
-        "debug-info", help="print out all diagnostic info",
+        "debug-info",
+        help="print out all diagnostic info",
     )
     create_debug_info_subparser(debug_info_parser)
 
@@ -85,7 +96,8 @@ def create_parser() -> argparse.ArgumentParser:
     create_edit_subparser(edit_parser)
 
     freeze_parser = subparsers.add_parser(
-        "freeze", help="freeze a live tmux session to a tmuxp workspace file",
+        "freeze",
+        help="freeze a live tmux session to a tmuxp workspace file",
     )
     create_freeze_subparser(freeze_parser)
 

src/tmuxp/cli/convert.py

@@ -57,7 +57,8 @@ def command_convert(
 ) -> None:
     """Entrypoint for ``tmuxp convert`` convert a tmuxp config between JSON and YAML."""
     workspace_file = find_workspace_file(
-        workspace_file, workspace_dir=get_workspace_dir(),
+        workspace_file,
+        workspace_dir=get_workspace_dir(),
     )
 
     if isinstance(workspace_file, str):

src/tmuxp/cli/freeze.py

@@ -45,10 +45,16 @@ def create_freeze_subparser(
         action="store",
     )
     parser.add_argument(
-        "-S", dest="socket_path", metavar="socket-path", help="pass-through for tmux -S",
+        "-S",
+        dest="socket_path",
+        metavar="socket-path",
+        help="pass-through for tmux -S",
     )
     parser.add_argument(
-        "-L", dest="socket_name", metavar="socket-name", help="pass-through for tmux -L",
+        "-L",
+        dest="socket_name",
+        metavar="socket-name",
+        help="pass-through for tmux -L",
     )
     parser.add_argument(
         "-f",
@@ -187,7 +193,10 @@ def extract_workspace_format(
 
     if workspace_format == "yaml":
         workspace = configparser.dump(
-            format="yaml", indent=2, default_flow_style=False, safe=True,
+            format="yaml",
+            indent=2,
+            default_flow_style=False,
+            safe=True,
         )
     elif workspace_format == "json":
         workspace = configparser.dump(format="json", indent=2)

src/tmuxp/cli/import_config.py

@@ -67,11 +67,14 @@ def create_import_subparser(
 ) -> argparse.ArgumentParser:
     """Augment :class:`argparse.ArgumentParser` with ``import`` subparser."""
     importsubparser = parser.add_subparsers(
-        title="commands", description="valid commands", help="additional help",
+        title="commands",
+        description="valid commands",
+        help="additional help",
     )
 
     import_teamocil = importsubparser.add_parser(
-        "teamocil", help="convert and import a teamocil config",
+        "teamocil",
+        help="convert and import a teamocil config",
     )
 
     import_teamocilgroup = import_teamocil.add_mutually_exclusive_group(required=True)
@@ -83,11 +86,13 @@ def create_import_subparser(
         help="checks current ~/.teamocil and current directory for yaml files",
     )
     import_teamocil.set_defaults(
-        callback=command_import_teamocil, import_subparser_name="teamocil",
+        callback=command_import_teamocil,
+        import_subparser_name="teamocil",
     )
 
     import_tmuxinator = importsubparser.add_parser(
-        "tmuxinator", help="convert and import a tmuxinator config",
+        "tmuxinator",
+        help="convert and import a tmuxinator config",
     )
 
     import_tmuxinatorgroup = import_tmuxinator.add_mutually_exclusive_group(
@@ -102,7 +107,8 @@ def create_import_subparser(
     )
 
     import_tmuxinator.set_defaults(
-        callback=command_import_tmuxinator, import_subparser_name="tmuxinator",
+        callback=command_import_tmuxinator,
+        import_subparser_name="tmuxinator",
     )
 
     try:
@@ -134,7 +140,9 @@ def import_config(
     cfg_reader = ConfigReader(importfunc(existing_workspace_file))
 
     workspace_file_format = prompt_choices(
-        "Convert to", choices=["yaml", "json"], default="yaml",
+        "Convert to",
+        choices=["yaml", "json"],
+        default="yaml",
     )
 
     if workspace_file_format == "yaml":
@@ -155,7 +163,8 @@ def import_config(
         dest = None
         while not dest:
             dest_path = prompt(
-                "Save to [%s]" % os.getcwd(), value_proc=_resolve_path_no_overwrite,
+                "Save to [%s]" % os.getcwd(),
+                value_proc=_resolve_path_no_overwrite,
             )
 
             # dest = dest_prompt
@@ -185,7 +194,8 @@ def command_import_tmuxinator(
     it into tmuxp.
     """
     workspace_file = find_workspace_file(
-        workspace_file, workspace_dir=get_tmuxinator_dir(),
+        workspace_file,
+        workspace_dir=get_tmuxinator_dir(),
     )
     import_config(workspace_file, importers.import_tmuxinator)
 
@@ -200,7 +210,8 @@ def command_import_teamocil(
     it into tmuxp.
     """
     workspace_file = find_workspace_file(
-        workspace_file, workspace_dir=get_teamocil_dir(),
+        workspace_file,
+        workspace_dir=get_teamocil_dir(),
     )
 
     import_config(workspace_file, importers.import_teamocil)

src/tmuxp/cli/load.py

@@ -381,7 +381,8 @@ def load_workspace(
 
     # shapes workspaces relative to config / profile file location
     expanded_workspace = loader.expand(
-        raw_workspace, cwd=os.path.dirname(workspace_file),
+        raw_workspace,
+        cwd=os.path.dirname(workspace_file),
     )
 
     # Overridden session name
@@ -636,7 +637,8 @@ def command_load(
 
     for idx, workspace_file in enumerate(args.workspace_files):
         workspace_file = find_workspace_file(
-            workspace_file, workspace_dir=get_workspace_dir(),
+            workspace_file,
+            workspace_dir=get_workspace_dir(),
         )
 
         detached = original_detached_option

src/tmuxp/cli/shell.py

@@ -14,7 +14,13 @@
 
     CLIColorsLiteral: TypeAlias = t.Literal[56, 88]
     CLIShellLiteral: TypeAlias = t.Literal[
-        "best", "pdb", "code", "ptipython", "ptpython", "ipython", "bpython",
+        "best",
+        "pdb",
+        "code",
+        "ptipython",
+        "ptpython",
+        "ipython",
+        "bpython",
     ]
 
 
@@ -38,10 +44,16 @@ def create_shell_subparser(parser: argparse.ArgumentParser) -> argparse.Argument
     parser.add_argument("session_name", metavar="session-name", nargs="?")
     parser.add_argument("window_name", metavar="window-name", nargs="?")
     parser.add_argument(
-        "-S", dest="socket_path", metavar="socket-path", help="pass-through for tmux -S",
+        "-S",
+        dest="socket_path",
+        metavar="socket-path",
+        help="pass-through for tmux -S",
     )
     parser.add_argument(
-        "-L", dest="socket_name", metavar="socket-name", help="pass-through for tmux -L",
+        "-L",
+        dest="socket_name",
+        metavar="socket-name",
+        help="pass-through for tmux -L",
     )
     parser.add_argument(
         "-c",
@@ -163,11 +175,15 @@ def command_shell(
     current_pane = util.get_current_pane(server=server)
 
     session = util.get_session(
-        server=server, session_name=args.session_name, current_pane=current_pane,
+        server=server,
+        session_name=args.session_name,
+        current_pane=current_pane,
     )
 
     window = util.get_window(
-        session=session, window_name=args.window_name, current_pane=current_pane,
+        session=session,
+        window_name=args.window_name,
+        current_pane=current_pane,
     )
 
     pane = util.get_pane(window=window, current_pane=current_pane)

src/tmuxp/cli/utils.py

@@ -200,7 +200,8 @@ def strip_ansi(value: str) -> str:
 
 
 def _interpret_color(
-    color: t.Union[int, t.Tuple[int, int, int], str], offset: int = 0,
+    color: t.Union[int, t.Tuple[int, int, int], str],
+    offset: int = 0,
 ) -> str:
     if isinstance(color, int):
         return f"{38 + offset};5;{color:d}"

src/tmuxp/exc.py

@@ -111,7 +111,10 @@ class BeforeLoadScriptError(Exception):
     """
 
     def __init__(
-        self, returncode: int, cmd: str, output: t.Optional[str] = None,
+        self,
+        returncode: int,
+        cmd: str,
+        output: t.Optional[str] = None,
     ) -> None:
         self.returncode = returncode
         self.cmd = cmd