ruff . --select COM --fix

Author: tony

conftest.py

@@ -59,7 +59,7 @@ 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,7 @@
 
 
 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 +47,7 @@ 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:
@@ -106,7 +106,7 @@ def render_aafig_images(app: "Sphinx", doctree: nodes.Node) -> None:
     if aafigure is None:
         logger.warn(
             "aafigure module not installed, ASCII art images "
-            "will be rendered as literal text"
+            "will be rendered as literal text",
         )
     for img in doctree.traverse(nodes.image):
         if not hasattr(img, "aafig"):
@@ -123,7 +123,7 @@ def render_aafig_images(app: "Sphinx", doctree: nodes.Node) -> None:
             logger.warn(
                 'unsupported builder format "%s", please '
                 "add a custom entry in aafig_format config "
-                "option for this builder" % format
+                "option for this builder" % format,
             )
             img.replace_self(nodes.literal_block(text, text))
             continue
@@ -152,7 +152,7 @@ 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:
@@ -172,7 +172,7 @@ def render_aafigure(
                 "aafig: the builder format %s is not officially "
                 "supported, aafigure images could not work. "
                 "Please report problems and working builder to "
-                "avoid this warning in the future" % app.builder.format
+                "avoid this warning in the future" % app.builder.format,
             )
         relfn = fname
         outfn = path.join(app.builder.outdir, fname)

docs/conf.py

@@ -99,7 +99,7 @@
         "sidebar/navigation.html",
         "sidebar/projects.html",
         "sidebar/scroll-end.html",
-    ]
+    ],
 }
 
 # linkify_issues

src/tmuxp/cli/__init__.py

@@ -34,7 +34,7 @@
 
     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 +60,21 @@ 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 +85,7 @@ 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

@@ -46,7 +46,7 @@ class ConvertUnknownFileType(exc.TmuxpException):
 
     def __init__(self, ext: str, *args: object, **kwargs: object) -> None:
         return super().__init__(
-            f"Unknown filetype: {ext} (valid: [.json, .yaml, .yml])"
+            f"Unknown filetype: {ext} (valid: [.json, .yaml, .yml])",
         )
 
 
@@ -57,7 +57,7 @@ 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/debug_info.py

@@ -45,7 +45,7 @@ def format_tmux_resp(std_resp: tmux_cmd) -> str:
                 Fore.RED,
                 "\n".join(prepend_tab(std_resp.stderr)),
                 Fore.RESET,
-            ]
+            ],
         )
 
     output = [
@@ -58,8 +58,8 @@ def format_tmux_resp(std_resp: tmux_cmd) -> str:
                     "arch: %s" % platform.machine(),
                     "uname: %s" % "; ".join(platform.uname()[:3]),
                     "version: %s" % platform.version(),
-                ]
-            )
+                ],
+            ),
         ),
         output_break(),
         "python version: %s" % " ".join(sys.version.split("\n")),

src/tmuxp/cli/freeze.py

@@ -45,10 +45,10 @@ 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",
@@ -118,19 +118,19 @@ def command_freeze(
         print(
             "---------------------------------------------------------------"
             "\n"
-            "Freeze does its best to snapshot live tmux sessions.\n"
+            "Freeze does its best to snapshot live tmux sessions.\n",
         )
     if not (
         args.answer_yes
         or prompt_yes_no(
-            "The new workspace will require adjusting afterwards. Save workspace file?"
+            "The new workspace will require adjusting afterwards. Save workspace file?",
         )
     ):
         if not args.quiet:
             print(
                 "tmuxp has examples in JSON and YAML format at "
                 "<http://tmuxp.git-pull.com/examples.html>\n"
-                "View tmuxp docs at <http://tmuxp.git-pull.com/>."
+                "View tmuxp docs at <http://tmuxp.git-pull.com/>.",
             )
         sys.exit()
 
@@ -143,7 +143,7 @@ def command_freeze(
                     frozen_workspace.get("session_name"),
                     args.workspace_format or "yaml",
                 ),
-            )
+            ),
         )
         dest_prompt = prompt(
             "Save to: %s" % save_to,
@@ -187,7 +187,7 @@ 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,11 @@ 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,15 +83,15 @@ 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(
-        required=True
+        required=True,
     )
     tmuxinator_workspace_file = import_tmuxinatorgroup.add_argument(
         dest="workspace_file",
@@ -102,7 +102,7 @@ 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 +134,7 @@ 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":
@@ -147,15 +147,15 @@ def import_config(
     tmuxp_echo(
         new_config + "---------------------------------------------------------------"
         "\n"
-        "Configuration import does its best to convert files.\n"
+        "Configuration import does its best to convert files.\n",
     )
     if prompt_yes_no(
-        "The new config *WILL* require adjusting afterwards. Save config?"
+        "The new config *WILL* require adjusting afterwards. Save 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
@@ -170,7 +170,7 @@ def import_config(
         tmuxp_echo(
             "tmuxp has examples in JSON and YAML format at "
             "<http://tmuxp.git-pull.com/examples.html>\n"
-            "View tmuxp docs at <http://tmuxp.git-pull.com/>"
+            "View tmuxp docs at <http://tmuxp.git-pull.com/>",
         )
         sys.exit()
 
@@ -185,7 +185,7 @@ 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 +200,7 @@ 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

@@ -117,7 +117,7 @@ def load_plugins(session_config: t.Dict[str, t.Any]) -> t.List[t.Any]:
                 tmuxp_echo(
                     style("[Plugin Error] ", fg="red")
                     + f"Couldn't load {plugin}\n"
-                    + style(f"{error}", fg="yellow")
+                    + style(f"{error}", fg="yellow"),
                 )
                 sys.exit(1)
 
@@ -137,14 +137,14 @@ def load_plugins(session_config: t.Dict[str, t.Any]) -> t.List[t.Any]:
                 ):
                     tmuxp_echo(
                         style("[Not Skipping] ", fg="yellow")
-                        + "Plugin versions constraint not met. Exiting..."
+                        + "Plugin versions constraint not met. Exiting...",
                     )
                     sys.exit(1)
             except Exception as error:
                 tmuxp_echo(
                     style("[Plugin Error] ", fg="red")
                     + f"Couldn't load {plugin}\n"
-                    + style(f"{error}", fg="yellow")
+                    + style(f"{error}", fg="yellow"),
                 )
                 sys.exit(1)
 
@@ -373,15 +373,15 @@ def load_workspace(
 
     tmuxp_echo(
         style("[Loading] ", fg="green")
-        + style(str(workspace_file), fg="blue", bold=True)
+        + style(str(workspace_file), fg="blue", bold=True),
     )
 
     # ConfigReader allows us to open a yaml or json file as a dict
     raw_workspace = config_reader.ConfigReader._from_file(workspace_file) or {}
 
     # 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 +636,7 @@ 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,7 @@
 
     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 +38,10 @@ 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 +163,11 @@ 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)