From 0ba266590c1b055b16daf8849a9f89222a2930cc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 23 Jan 2024 10:39:48 +0100 Subject: [PATCH] Drop unnecessary parentheses around conditionals --- mkosi/__init__.py | 4 ++-- mkosi/config.py | 4 ++-- mkosi/qemu.py | 4 ++-- mkosi/run.py | 2 +- mkosi/util.py | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mkosi/__init__.py b/mkosi/__init__.py index 07e6c3184..de3350a2d 100644 --- a/mkosi/__init__.py +++ b/mkosi/__init__.py @@ -2650,7 +2650,7 @@ def make_disk( defaults = context.workspace / "repart-definitions" if not defaults.exists(): defaults.mkdir() - if (arch := context.config.architecture.to_efi()): + if arch := context.config.architecture.to_efi(): bootloader = context.root / f"efi/EFI/BOOT/BOOT{arch.upper()}.EFI" else: bootloader = None @@ -3432,7 +3432,7 @@ def run_clean(args: Args, config: Config) -> None: remove_build_cache = args.force > 1 remove_package_cache = args.force > 2 - if (outputs := list(config.output_dir_or_cwd().glob(f"{config.output}*"))): + if outputs := list(config.output_dir_or_cwd().glob(f"{config.output}*")): with complete_step(f"Removing output files of {config.name()} image…"): rmtree(*outputs) diff --git a/mkosi/config.py b/mkosi/config.py index 3e0a4b200..18b79560a 100644 --- a/mkosi/config.py +++ b/mkosi/config.py @@ -2866,7 +2866,7 @@ def parse_config(argv: Sequence[str] = ()) -> tuple[Args, tuple[Config, ...]]: if not v: die("Match value cannot be empty") - if (s := SETTINGS_LOOKUP_BY_NAME.get(k)): + if s := SETTINGS_LOOKUP_BY_NAME.get(k): if not s.match: die(f"{k} cannot be used in [Match]") @@ -2881,7 +2881,7 @@ def parse_config(argv: Sequence[str] = ()) -> tuple[Args, tuple[Config, ...]]: else: result = s.match(v, getattr(namespace, s.dest)) - elif (m := MATCH_LOOKUP.get(k)): + elif m := MATCH_LOOKUP.get(k): result = m.match(v) else: die(f"{k} cannot be used in [Match]") diff --git a/mkosi/qemu.py b/mkosi/qemu.py index bc641d0c2..6d3066880 100644 --- a/mkosi/qemu.py +++ b/mkosi/qemu.py @@ -485,7 +485,7 @@ def run_qemu(args: Args, config: Config) -> None: ): die(f"{config.output_format} images cannot be booted with the '{config.qemu_firmware}' firmware") - if (config.runtime_trees and config.qemu_firmware == QemuFirmware.bios): + if config.runtime_trees and config.qemu_firmware == QemuFirmware.bios: die("RuntimeTrees= cannot be used when booting in BIOS firmware") if config.qemu_kvm == ConfigFeature.enabled and not config.architecture.is_native(): @@ -503,7 +503,7 @@ def run_qemu(args: Args, config: Config) -> None: have_kvm = ((qemu_version(config) < QEMU_KVM_DEVICE_VERSION and QemuDeviceNode.kvm.available()) or (qemu_version(config) >= QEMU_KVM_DEVICE_VERSION and QemuDeviceNode.kvm in qemu_device_fds)) - if (config.qemu_kvm == ConfigFeature.enabled and not have_kvm): + if config.qemu_kvm == ConfigFeature.enabled and not have_kvm: die("KVM acceleration requested but cannot access /dev/kvm") if config.qemu_vsock == ConfigFeature.enabled and QemuDeviceNode.vhost_vsock not in qemu_device_fds: diff --git a/mkosi/run.py b/mkosi/run.py index c72ed4eca..2f943d22d 100644 --- a/mkosi/run.py +++ b/mkosi/run.py @@ -418,7 +418,7 @@ def find_binary(*names: PathString, root: Path = Path("/")) -> Optional[Path]: elif "/" in str(name): name = root / name - if (binary := shutil.which(name, path=path)): + if binary := shutil.which(name, path=path): if root != Path("/") and not Path(binary).is_relative_to(root): return Path(binary) else: diff --git a/mkosi/util.py b/mkosi/util.py index 102747aea..454d5f096 100644 --- a/mkosi/util.py +++ b/mkosi/util.py @@ -41,7 +41,7 @@ def read_env_file(path: Path) -> Iterator[tuple[str, str]]: line = line.rstrip() if not line or line.startswith("#"): continue - if (m := re.match(r"([A-Z][A-Z_0-9]+)=(.*)", line)): + if m := re.match(r"([A-Z][A-Z_0-9]+)=(.*)", line): name, val = m.groups() if val and val[0] in "\"'": val = ast.literal_eval(val) -- 2.47.2