From af043afa881312fb02bfc0421c9d630192664dc4 Mon Sep 17 00:00:00 2001 From: correctmost <134317971+correctmost@users.noreply.github.com> Date: Sun, 1 Dec 2024 01:44:39 -0500 Subject: [PATCH] Enable the unnecessary-lambda pylint rule and fix warnings (#2983) --- archinstall/lib/configuration.py | 6 ++-- archinstall/lib/disk/disk_menu.py | 4 +-- archinstall/lib/disk/encryption_menu.py | 4 +-- archinstall/lib/global_menu.py | 40 ++++++++++++------------- archinstall/lib/locale/locale_menu.py | 6 ++-- archinstall/lib/mirrors.py | 4 +-- archinstall/lib/profile/profile_menu.py | 4 +-- pyproject.toml | 1 - 8 files changed, 34 insertions(+), 35 deletions(-) diff --git a/archinstall/lib/configuration.py b/archinstall/lib/configuration.py index a9da537f..c21b1447 100644 --- a/archinstall/lib/configuration.py +++ b/archinstall/lib/configuration.py @@ -157,17 +157,17 @@ def save_config(config: dict[str, Any]) -> None: MenuItem( str(_("Save user configuration (including disk layout)")), value="user_config", - preview_action=lambda x: preview(x) + preview_action=preview ), MenuItem( str(_("Save user credentials")), value="user_creds", - preview_action=lambda x: preview(x) + preview_action=preview ), MenuItem( str(_("Save all")), value="all", - preview_action=lambda x: preview(x) + preview_action=preview ) ] diff --git a/archinstall/lib/disk/disk_menu.py b/archinstall/lib/disk/disk_menu.py index b12f9b7d..1e255aa6 100644 --- a/archinstall/lib/disk/disk_menu.py +++ b/archinstall/lib/disk/disk_menu.py @@ -37,14 +37,14 @@ class DiskLayoutConfigurationMenu(AbstractSubMenu): return [ MenuItem( text=str(_('Partitioning')), - action=lambda x: self._select_disk_layout_config(x), + action=self._select_disk_layout_config, value=self._disk_layout_config, preview_action=self._prev_disk_layouts, key='disk_config' ), MenuItem( text='LVM (BETA)', - action=lambda x: self._select_lvm_config(x), + action=self._select_lvm_config, value=self._disk_layout_config.lvm_config if self._disk_layout_config else None, preview_action=self._prev_lvm_config, dependencies=[self._check_dep_lvm], diff --git a/archinstall/lib/disk/encryption_menu.py b/archinstall/lib/disk/encryption_menu.py index 7ba00931..3f8e99f3 100644 --- a/archinstall/lib/disk/encryption_menu.py +++ b/archinstall/lib/disk/encryption_menu.py @@ -65,7 +65,7 @@ class DiskEncryptionMenu(AbstractSubMenu): ), MenuItem( text=str(_('LVM volumes')), - action=lambda x: self._select_lvm_vols(x), + action=self._select_lvm_vols, value=self._preset.lvm_volumes, dependencies=[self._check_dep_lvm_vols], preview_action=self._preview, @@ -73,7 +73,7 @@ class DiskEncryptionMenu(AbstractSubMenu): ), MenuItem( text=str(_('HSM')), - action=lambda x: select_hsm(x), + action=select_hsm, value=self._preset.hsm_device, dependencies=[self._check_dep_enc_type], preview_action=self._preview, diff --git a/archinstall/lib/global_menu.py b/archinstall/lib/global_menu.py index 819092c9..0f4a6a4f 100644 --- a/archinstall/lib/global_menu.py +++ b/archinstall/lib/global_menu.py @@ -63,32 +63,32 @@ class GlobalMenu(AbstractMenu): return [ MenuItem( text=str(_('Archinstall language')), - action=lambda x: self._select_archinstall_language(x), + action=self._select_archinstall_language, display_action=lambda x: x.display_name if x else '', key='archinstall-language' ), MenuItem( text=str(_('Locales')), - action=lambda x: self._locale_selection(x), + action=self._locale_selection, preview_action=self._prev_locale, key='locale_config' ), MenuItem( text=str(_('Mirrors')), - action=lambda x: self._mirror_configuration(x), + action=self._mirror_configuration, preview_action=self._prev_mirror_config, key='mirror_config' ), MenuItem( text=str(_('Disk configuration')), - action=lambda x: self._select_disk_config(x), + action=self._select_disk_config, preview_action=self._prev_disk_config, mandatory=True, key='disk_config' ), MenuItem( text=str(_('Disk encryption')), - action=lambda x: self._disk_encryption(x), + action=self._disk_encryption, preview_action=self._prev_disk_encryption, key='disk_encryption', dependencies=['disk_config'] @@ -96,14 +96,14 @@ class GlobalMenu(AbstractMenu): MenuItem( text=str(_('Swap')), value=True, - action=lambda x: ask_for_swap(x), + action=ask_for_swap, preview_action=self._prev_swap, key='swap', ), MenuItem( text=str(_('Bootloader')), value=Bootloader.get_default(), - action=lambda x: self._select_bootloader(x), + action=self._select_bootloader, preview_action=self._prev_bootloader, mandatory=True, key='bootloader', @@ -111,87 +111,87 @@ class GlobalMenu(AbstractMenu): MenuItem( text=str(_('Unified kernel images')), value=False, - action=lambda x: ask_for_uki(x), + action=ask_for_uki, preview_action=self._prev_uki, key='uki', ), MenuItem( text=str(_('Hostname')), value='archlinux', - action=lambda x: ask_hostname(x), + action=ask_hostname, preview_action=self._prev_hostname, key='hostname', ), MenuItem( text=str(_('Root password')), - action=lambda x: self._set_root_password(x), + action=self._set_root_password, preview_action=self._prev_root_pwd, key='!root-password', ), MenuItem( text=str(_('User account')), - action=lambda x: self._create_user_account(x), + action=self._create_user_account, preview_action=self._prev_users, key='!users' ), MenuItem( text=str(_('Profile')), - action=lambda x: self._select_profile(x), + action=self._select_profile, preview_action=self._prev_profile, key='profile_config' ), MenuItem( text=str(_('Audio')), - action=lambda x: ask_for_audio_selection(x), + action=ask_for_audio_selection, preview_action=self._prev_audio, key='audio_config' ), MenuItem( text=str(_('Kernels')), value=['linux'], - action=lambda x: select_kernel(x), + action=select_kernel, preview_action=self._prev_kernel, mandatory=True, key='kernels' ), MenuItem( text=str(_('Network configuration')), - action=lambda x: ask_to_configure_network(x), + action=ask_to_configure_network, value={}, preview_action=self._prev_network_config, key='network_config' ), MenuItem( text=str(_('Parallel Downloads')), - action=lambda x: add_number_of_parallel_downloads(x), + action=add_number_of_parallel_downloads, value=0, preview_action=self._prev_parallel_dw, key='parallel downloads' ), MenuItem( text=str(_('Additional packages')), - action=lambda x: ask_additional_packages_to_install(x), + action=ask_additional_packages_to_install, value=[], preview_action=self._prev_additional_pkgs, key='packages' ), MenuItem( text=str(_('Optional repositories')), - action=lambda x: select_additional_repositories(x), + action=select_additional_repositories, value=[], preview_action=self._prev_additional_repos, key='additional-repositories' ), MenuItem( text=str(_('Timezone')), - action=lambda x: ask_for_a_timezone(x), + action=ask_for_a_timezone, value='UTC', preview_action=self._prev_tz, key='timezone' ), MenuItem( text=str(_('Automatic time sync (NTP)')), - action=lambda x: ask_ntp(x), + action=ask_ntp, value=True, preview_action=self._prev_ntp, key='ntp' diff --git a/archinstall/lib/locale/locale_menu.py b/archinstall/lib/locale/locale_menu.py index a92cd8c1..0e589ca1 100644 --- a/archinstall/lib/locale/locale_menu.py +++ b/archinstall/lib/locale/locale_menu.py @@ -79,21 +79,21 @@ class LocaleMenu(AbstractSubMenu): return [ MenuItem( text=str(_('Keyboard layout')), - action=lambda x: self._select_kb_layout(x), + action=self._select_kb_layout, value=self._locale_conf.kb_layout, preview_action=self._prev_locale, key='keyboard-layout' ), MenuItem( text=str(_('Locale language')), - action=lambda x: select_locale_lang(x), + action=select_locale_lang, value=self._locale_conf.sys_lang, preview_action=self._prev_locale, key='sys-language' ), MenuItem( text=str(_('Locale encoding')), - action=lambda x: select_locale_enc(x), + action=select_locale_enc, value=self._locale_conf.sys_enc, preview_action=self._prev_locale, key='sys-encoding' diff --git a/archinstall/lib/mirrors.py b/archinstall/lib/mirrors.py index a81544f6..f9b3b56d 100644 --- a/archinstall/lib/mirrors.py +++ b/archinstall/lib/mirrors.py @@ -265,14 +265,14 @@ class MirrorMenu(AbstractSubMenu): return [ MenuItem( text=str(_('Mirror region')), - action=lambda x: select_mirror_regions(x), + action=select_mirror_regions, value=self._mirror_config.mirror_regions, preview_action=self._prev_regions, key='mirror_regions' ), MenuItem( text=str(_('Custom mirrors')), - action=lambda x: select_custom_mirror(x), + action=select_custom_mirror, value=self._mirror_config.custom_mirrors, preview_action=self._prev_custom_mirror, key='custom_mirrors' diff --git a/archinstall/lib/profile/profile_menu.py b/archinstall/lib/profile/profile_menu.py index 0da8ccef..afb19707 100644 --- a/archinstall/lib/profile/profile_menu.py +++ b/archinstall/lib/profile/profile_menu.py @@ -39,14 +39,14 @@ class ProfileMenu(AbstractSubMenu): return [ MenuItem( text=str(_('Type')), - action=lambda x: self._select_profile(x), + action=self._select_profile, value=self._preset.profile, preview_action=self._preview_profile, key='profile' ), MenuItem( text=str(_('Graphics driver')), - action=lambda x: self._select_gfx_driver(x), + action=self._select_gfx_driver, value=self._preset.gfx_driver if self._preset.profile and self._preset.profile.is_graphic_driver_supported() else None, preview_action=self._prev_gfx, enabled=self._preset.profile.is_graphic_driver_supported() if self._preset.profile else False, diff --git a/pyproject.toml b/pyproject.toml index 0706570b..f2993be6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -160,7 +160,6 @@ disable = [ "fixme", "protected-access", "raise-missing-from", - "unnecessary-lambda", "unreachable", "unspecified-encoding", "unused-argument",