diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b25a9cb..edbac6c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -26,7 +26,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.8.5 + rev: v0.9.0 hooks: - id: ruff args: diff --git a/sandwine/_main.py b/sandwine/_main.py index bfce6a7..6cb7304 100644 --- a/sandwine/_main.py +++ b/sandwine/_main.py @@ -129,7 +129,7 @@ def parse_command_line(args: list[str], with_wine: bool): dest="x11", action="store_const", const=X11Mode.XPRA, - help="enable nested X11 using Xpra (EXPERIMENTAL, CAREFUL!)" " (default: X11 disabled)", + help="enable nested X11 using Xpra (EXPERIMENTAL, CAREFUL!) (default: X11 disabled)", ) x11_args.add_argument( "--xvfb", @@ -181,8 +181,7 @@ def parse_command_line(args: list[str], with_wine: bool): general.add_argument( "--configure", action="store_true", - help="enforce running winecfg before start of PROGRAM" - " (default: run winecfg as needed)", + help="enforce running winecfg before start of PROGRAM (default: run winecfg as needed)", ) else: mount.set_defaults(configure=None) @@ -201,8 +200,7 @@ def parse_command_line(args: list[str], with_wine: bool): dest="with_wine", default=True, action="store_false", - help="run PROGRAM without use of Wine" - ' (default: run command "wine PROGRAM [ARG ..]")', + help='run PROGRAM without use of Wine (default: run command "wine PROGRAM [ARG ..]")', ) else: mount.set_defaults(with_wine=False) @@ -525,7 +523,7 @@ def create_bwrap_argv(config): def require_recent_bubblewrap(): argv = ["bwrap", "--disable-userns", "--help"] if subprocess.call(argv, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) != 0: - _logger.error("sandwine requires bubblewrap >=0.8.0" ", aborting.") + _logger.error("sandwine requires bubblewrap >=0.8.0, aborting.") sys.exit(1) diff --git a/sandwine/_x11.py b/sandwine/_x11.py index 18d53e2..0da0a59 100644 --- a/sandwine/_x11.py +++ b/sandwine/_x11.py @@ -339,7 +339,7 @@ def detect_and_require_nested_x11() -> X11Mode: return mode commands = [clazz._command for clazz, _ in tests] - _logger.error(f'Neither {" nor ".join(commands)} is available, please install, aborting.') + _logger.error(f"Neither {' nor '.join(commands)} is available, please install, aborting.") sys.exit(127)