From 83737191b7ae840736ff0cef23aee3088823cb13 Mon Sep 17 00:00:00 2001 From: correctmost <134317971+correctmost@users.noreply.github.com> Date: Wed, 29 Apr 2026 18:42:12 -0400 Subject: [PATCH] Fix some inconsistent-return-statements Pylint warnings --- archinstall/lib/authentication/authentication_handler.py | 2 +- archinstall/lib/installer.py | 2 +- archinstall/lib/output.py | 2 +- archinstall/tui/ui/components.py | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/archinstall/lib/authentication/authentication_handler.py b/archinstall/lib/authentication/authentication_handler.py index a0b8e132..b9d5e267 100644 --- a/archinstall/lib/authentication/authentication_handler.py +++ b/archinstall/lib/authentication/authentication_handler.py @@ -53,7 +53,7 @@ class AuthenticationHandler: def _add_u2f_entry(self, file: Path, entry: str) -> None: if not file.exists(): debug(f'File does not exist: {file}') - return None + return content = file.read_text().splitlines() diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py index 7bbfbae5..44a10eb2 100644 --- a/archinstall/lib/installer.py +++ b/archinstall/lib/installer.py @@ -402,7 +402,7 @@ class Installer: def _mount_luks_partition(self, part_mod: PartitionModification, luks_handler: Luks2) -> None: if not luks_handler.mapper_dev: - return None + return if part_mod.fs_type == FilesystemType.BTRFS and part_mod.btrfs_subvols: # Only mount BTRFS subvolumes that have mountpoints specified diff --git a/archinstall/lib/output.py b/archinstall/lib/output.py index e01da3eb..bc4bb113 100644 --- a/archinstall/lib/output.py +++ b/archinstall/lib/output.py @@ -133,7 +133,7 @@ class Journald: try: import systemd.journal # type: ignore[import-not-found] except ModuleNotFoundError: - return None + return log_adapter = logging.getLogger('archinstall') log_fmt = logging.Formatter('[%(levelname)s]: %(message)s') diff --git a/archinstall/tui/ui/components.py b/archinstall/tui/ui/components.py index c51d35f9..da6dc66b 100644 --- a/archinstall/tui/ui/components.py +++ b/archinstall/tui/ui/components.py @@ -350,7 +350,7 @@ class OptionListScreen(BaseScreen[ValueT]): def _set_preview(self, item_id: str) -> None: if self._preview_location is None: - return None + return preview_widget = self.query_one('#preview_content', Label) item = self._group.find_by_id(item_id) @@ -530,7 +530,7 @@ class SelectListScreen(BaseScreen[ValueT]): selection_list = self.query_one(SelectionList) if not selection_list.has_focus or event.key != 'enter': - return None + return if len(self._selected_items) < 1: index = selection_list.highlighted @@ -743,7 +743,7 @@ class ConfirmationScreen(BaseScreen[ValueT]): if self._is_btn_focus(): item = self._group.focus_item if not item: - return None + return _ = self.dismiss(Result(ResultType.Selection, _item=item))