Fix new ruff errors

rhinstaller · Nov 27, 2024 · 01cffcc · 01cffcc
1 parent 62b17b1
commit 01cffcc
Show file tree

Hide file tree

Showing 58 changed files with 175 additions and 97 deletions.
diff --git a/pyanaconda/core/configuration/anaconda.py b/pyanaconda/core/configuration/anaconda.py
@@ -40,7 +40,7 @@
 
 log = get_module_logger(__name__)
 
-__all__ = ["conf", "AnacondaConfiguration"]
+__all__ = ["AnacondaConfiguration", "conf"]
 
 
 class AnacondaSection(Section):

diff --git a/pyanaconda/core/dbus.py b/pyanaconda/core/dbus.py
@@ -27,7 +27,7 @@
 
 log = get_module_logger(__name__)
 
-__all__ = ["DBus", "SystemBus", "SessionBus", "error_mapper", "dbus_error"]
+__all__ = ["DBus", "SessionBus", "SystemBus", "dbus_error", "error_mapper"]
 
 
 class AnacondaMessageBus(MessageBus):

diff --git a/pyanaconda/core/glib.py b/pyanaconda/core/glib.py
@@ -43,17 +43,35 @@
 log = get_module_logger(__name__)
 
 
-__all__ = ["create_main_loop", "create_new_context",
-           "markup_escape_text", "format_size_full",
-           "timeout_add_seconds", "timeout_add", "idle_add",
-           "io_add_watch", "child_watch_add",
-           "source_remove", "timeout_source_new",
-           "spawn_close_pid", "spawn_async_with_pipes",
-           "log_writer_format_fields", "log_set_handler", "log_set_writer_func",
-           "GError", "Variant", "VariantType", "Bytes",
-           "IOCondition", "IOChannel", "SpawnFlags",
-           "LogWriterOutput", "LogLevelFlags",
-           "MAXUINT", "Cancellable"]
+__all__ = [
+    "MAXUINT",
+    "Bytes",
+    "Cancellable",
+    "GError",
+    "IOChannel",
+    "IOCondition",
+    "LogLevelFlags",
+    "LogWriterOutput",
+    "SpawnFlags",
+    "Variant",
+    "VariantType",
+    "child_watch_add",
+    "create_main_loop",
+    "create_new_context",
+    "format_size_full",
+    "idle_add",
+    "io_add_watch",
+    "log_set_handler",
+    "log_set_writer_func",
+    "log_writer_format_fields",
+    "markup_escape_text",
+    "source_remove",
+    "spawn_async_with_pipes",
+    "spawn_close_pid",
+    "timeout_add",
+    "timeout_add_seconds",
+    "timeout_source_new",
+]
 
 
 def create_main_loop(main_context=None):

diff --git a/pyanaconda/core/i18n.py b/pyanaconda/core/i18n.py
@@ -17,7 +17,7 @@
 # Red Hat, Inc.
 #
 
-__all__ = ["_", "N_", "P_", "C_", "CN_", "CP_"]
+__all__ = ["CN_", "CP_", "C_", "N_", "P_", "_"]
 
 import gettext
 

diff --git a/pyanaconda/core/kickstart/addon.py b/pyanaconda/core/kickstart/addon.py
@@ -28,7 +28,7 @@
 
 log = get_module_logger(__name__)
 
-__all__ = ["AddonData", "AddonSection", "AddonRegistry"]
+__all__ = ["AddonData", "AddonRegistry", "AddonSection"]
 
 
 class AddonData(KickstartObject, metaclass=ABCMeta):

diff --git a/pyanaconda/core/kickstart/specification.py b/pyanaconda/core/kickstart/specification.py
@@ -23,8 +23,12 @@
 from pyanaconda.core.kickstart.version import VERSION
 from pyanaconda.core.kickstart.addon import AddonSection, AddonRegistry
 
-__all__ = ["KickstartSpecification", "NoKickstartSpecification",
-           "KickstartSpecificationHandler", "KickstartSpecificationParser"]
+__all__ = [
+    "KickstartSpecification",
+    "KickstartSpecificationHandler",
+    "KickstartSpecificationParser",
+    "NoKickstartSpecification",
+]
 
 
 class KickstartSpecification(object):

diff --git a/pyanaconda/core/service.py b/pyanaconda/core/service.py
@@ -20,8 +20,15 @@
 
 log = get_module_logger(__name__)
 
-__all__ = ["start_service", "stop_service", "restart_service", "is_service_running",
-           "is_service_installed", "enable_service", "disable_service"]
+__all__ = [
+    "disable_service",
+    "enable_service",
+    "is_service_installed",
+    "is_service_running",
+    "restart_service",
+    "start_service",
+    "stop_service",
+]
 
 
 def _run_systemctl(command, service, root):

diff --git a/pyanaconda/modules/boss/kickstart_manager/parser.py b/pyanaconda/modules/boss/kickstart_manager/parser.py
@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-__all__ = ["SplitKickstartParser", "VALID_SECTIONS_ANACONDA"]
+__all__ = ["VALID_SECTIONS_ANACONDA", "SplitKickstartParser"]
 
 from pykickstart.parser import KickstartParser
 from pykickstart.sections import Section

diff --git a/pyanaconda/modules/common/base/__init__.py b/pyanaconda/modules/common/base/__init__.py
@@ -21,6 +21,12 @@
 from pyanaconda.modules.common.base.base_template import ModuleInterfaceTemplate, \
     KickstartModuleInterfaceTemplate
 
-__all__ = ["BaseModule", "Service", "KickstartBaseModule", "KickstartService",
-           "ModuleInterfaceTemplate", "KickstartModuleInterfaceTemplate",
-           "KickstartModuleInterface"]
+__all__ = [
+           "BaseModule",
+           "KickstartBaseModule",
+           "KickstartModuleInterface",
+           "KickstartModuleInterfaceTemplate",
+           "KickstartService",
+           "ModuleInterfaceTemplate",
+           "Service",
+]
diff --git a/pyanaconda/modules/common/base/base_template.py b/pyanaconda/modules/common/base/base_template.py
@@ -20,7 +20,7 @@
 
 from dasbus.server.template import InterfaceTemplate
 
-__all__ = ["InterfaceTemplate", "ModuleInterfaceTemplate", "KickstartModuleInterfaceTemplate"]
+__all__ = ["InterfaceTemplate", "KickstartModuleInterfaceTemplate", "ModuleInterfaceTemplate"]
 
 
 class ModuleInterfaceTemplate(InterfaceTemplate):

diff --git a/pyanaconda/modules/common/structures/comps.py b/pyanaconda/modules/common/structures/comps.py
@@ -19,7 +19,7 @@
 from dasbus.structure import DBusData
 from dasbus.typing import *  # pylint: disable=wildcard-import
 
-__all__ = ["CompsGroupData", "CompsEnvironmentData"]
+__all__ = ["CompsEnvironmentData", "CompsGroupData"]
 
 
 class CompsGroupData(DBusData):

diff --git a/pyanaconda/modules/common/structures/device_factory.py b/pyanaconda/modules/common/structures/device_factory.py
@@ -21,7 +21,7 @@
 from dasbus.structure import DBusData
 from dasbus.typing import *  # pylint: disable=wildcard-import
 
-__all__ = ["DeviceFactoryRequest", "DeviceFactoryPermissions"]
+__all__ = ["DeviceFactoryPermissions", "DeviceFactoryRequest"]
 
 
 class DeviceFactoryRequest(DBusData):

diff --git a/pyanaconda/modules/common/structures/iscsi.py b/pyanaconda/modules/common/structures/iscsi.py
@@ -19,7 +19,7 @@
 from dasbus.structure import DBusData
 from dasbus.typing import *  # pylint: disable=wildcard-import
 
-__all__ = ["Portal", "Credentials", "Node"]
+__all__ = ["Credentials", "Node", "Portal"]
 
 
 class Portal(DBusData):

diff --git a/pyanaconda/modules/common/structures/packages.py b/pyanaconda/modules/common/structures/packages.py
@@ -23,7 +23,7 @@
 from pyanaconda.core.constants import MULTILIB_POLICY_BEST, RPM_LANGUAGES_ALL, \
     DNF_DEFAULT_TIMEOUT, DNF_DEFAULT_RETRIES
 
-__all__ = ["PackagesSelectionData", "PackagesConfigurationData"]
+__all__ = ["PackagesConfigurationData", "PackagesSelectionData"]
 
 
 class PackagesSelectionData(DBusData):

diff --git a/pyanaconda/modules/common/structures/partitioning.py b/pyanaconda/modules/common/structures/partitioning.py
@@ -22,7 +22,7 @@
 
 from pyanaconda.core.configuration.anaconda import conf
 
-__all__ = ["PartitioningRequest", "MountPointRequest"]
+__all__ = ["MountPointRequest", "PartitioningRequest"]
 
 
 class PartitioningRequest(DBusData):

diff --git a/pyanaconda/modules/common/structures/secret.py b/pyanaconda/modules/common/structures/secret.py
@@ -27,7 +27,7 @@
 
 log = get_module_logger(__name__)
 
-__all__ = ["get_public_copy", "hide_secrets", "SecretData", "SecretDataList"]
+__all__ = ["SecretData", "SecretDataList", "get_public_copy", "hide_secrets"]
 
 
 def get_public_copy(obj: DBusData):

diff --git a/pyanaconda/modules/common/structures/storage.py b/pyanaconda/modules/common/structures/storage.py
@@ -19,7 +19,7 @@
 from dasbus.structure import DBusData
 from dasbus.typing import *  # pylint: disable=wildcard-import
 
-__all__ = ["DeviceData", "DeviceFormatData", "DeviceActionData", "OSData"]
+__all__ = ["DeviceActionData", "DeviceData", "DeviceFormatData", "OSData"]
 
 
 class DeviceData(DBusData):

diff --git a/pyanaconda/modules/common/structures/subscription.py b/pyanaconda/modules/common/structures/subscription.py
@@ -23,7 +23,7 @@
 
 from pyanaconda.modules.common.structures.secret import SecretData, SecretDataList
 
-__all__ = ["SystemPurposeData", "SubscriptionRequest", "AttachedSubscription"]
+__all__ = ["AttachedSubscription", "SubscriptionRequest", "SystemPurposeData"]
 
 
 class SystemPurposeData(DBusData):

diff --git a/pyanaconda/modules/common/structures/timezone.py b/pyanaconda/modules/common/structures/timezone.py
@@ -21,7 +21,7 @@
 
 from pyanaconda.core.constants import TIME_SOURCE_SERVER
 
-__all__ = ["TimeSourceData", "GeolocationData"]
+__all__ = ["GeolocationData", "TimeSourceData"]
 
 
 class TimeSourceData(DBusData):

diff --git a/pyanaconda/modules/common/task/__init__.py b/pyanaconda/modules/common/task/__init__.py
@@ -21,8 +21,15 @@
 from pyanaconda.modules.common.task.task_interface import TaskInterface
 from pyanaconda.modules.common.task.task import Task, ValidationTask, AbstractTask
 
-__all__ = ["sync_run_task", "async_run_task", "wait_for_task", "AbstractTask", "Task",
-           "ValidationTask", "TaskInterface"]
+__all__ = [
+    "AbstractTask",
+    "Task",
+    "TaskInterface",
+    "ValidationTask",
+    "async_run_task",
+    "sync_run_task",
+    "wait_for_task",
+]
 
 
 def sync_run_task(task_proxy, callback=None):

diff --git a/pyanaconda/modules/network/config_file.py b/pyanaconda/modules/network/config_file.py
@@ -23,7 +23,7 @@
 from pyanaconda.anaconda_loggers import get_module_logger
 log = get_module_logger(__name__)
 
-__all__ = ["get_config_files_content", "is_config_file_for_system", "IFCFG_DIR", "KEYFILE_DIR"]
+__all__ = ["IFCFG_DIR", "KEYFILE_DIR", "get_config_files_content", "is_config_file_for_system"]
 
 IFCFG_DIR = "/etc/sysconfig/network-scripts"
 KEYFILE_DIR = "/etc/NetworkManager/system-connections"
@@ -58,8 +58,8 @@ def get_config_files_paths(root_path=""):
 def is_config_file_for_system(filename):
     """Checks if the file stores configuration for target system."""
     dirname = os.path.dirname(filename)
-    return (dirname == IFCFG_DIR and _has_ifcfg_basename(filename) or
-            dirname == KEYFILE_DIR and _has_keyfile_basename(filename))
+    return ((dirname == IFCFG_DIR and _has_ifcfg_basename(filename)) or
+            (dirname == KEYFILE_DIR and _has_keyfile_basename(filename)))
 
 
 def _has_ifcfg_basename(name):

diff --git a/pyanaconda/modules/network/kickstart.py b/pyanaconda/modules/network/kickstart.py
@@ -95,8 +95,8 @@ def update_first_network_command_activate_value(network_data_list):
 
 
 def is_hostname_only_network_args(args):
-    return (len(args) == 1 and args[0].startswith("--hostname") or
-            len(args) == 2 and "--hostname" in args)
+    return ((len(args) == 1 and args[0].startswith("--hostname")) or
+            (len(args) == 2 and "--hostname" in args))
 
 
 def is_hostname_only_network_data(network_data):

diff --git a/pyanaconda/modules/payloads/installation.py b/pyanaconda/modules/payloads/installation.py
@@ -27,7 +27,7 @@
 
 log = get_module_logger(__name__)
 
-__all__ = ["PrepareSystemForInstallationTask", "CopyDriverDisksFilesTask"]
+__all__ = ["CopyDriverDisksFilesTask", "PrepareSystemForInstallationTask"]
 
 
 class PrepareSystemForInstallationTask(Task):

diff --git a/pyanaconda/modules/payloads/payload/dnf/transaction_progress.py b/pyanaconda/modules/payloads/payload/dnf/transaction_progress.py
@@ -24,7 +24,7 @@
 
 log = get_module_logger(__name__)
 
-__all__ = ["process_transaction_progress", "TransactionProgress"]
+__all__ = ["TransactionProgress", "process_transaction_progress"]
 
 
 def process_transaction_progress(queue, callback):

diff --git a/pyanaconda/modules/payloads/payload/dnf/tree_info.py b/pyanaconda/modules/payloads/payload/dnf/tree_info.py
@@ -38,12 +38,12 @@
 log = get_module_logger(__name__)
 
 __all__ = [
-    "TreeInfoMetadataError",
-    "NoTreeInfoError",
     "InvalidTreeInfoError",
-    "TreeInfoMetadata",
     "LoadTreeInfoMetadataResult",
     "LoadTreeInfoMetadataTask",
+    "NoTreeInfoError",
+    "TreeInfoMetadata",
+    "TreeInfoMetadataError",
 ]
 
 

diff --git a/pyanaconda/modules/payloads/payload/rpm_ostree/installation.py b/pyanaconda/modules/payloads/payload/rpm_ostree/installation.py
@@ -371,7 +371,7 @@ def _run(self):
             # actually EFI (simulating grub2-efi being installed).  Second, as it's a mount point
             # that's expected to already exist (so if we used copytree, we'd traceback). If it
             # doesn't, we're not on a UEFI system, so we don't want to copy the data.
-            if not fname == 'efi' or is_efi and os.path.isdir(os.path.join(physboot, fname)):
+            if not fname == 'efi' or (is_efi and os.path.isdir(os.path.join(physboot, fname))):
                 log.info("Copying bootloader data: %s", fname)
                 safe_exec_with_redirect('cp', ['-r', '-p', srcpath, physboot])
 

diff --git a/pyanaconda/modules/payloads/source/nfs/initialization.py b/pyanaconda/modules/payloads/source/nfs/initialization.py
@@ -31,8 +31,8 @@
 log = get_module_logger(__name__)
 
 __all__ = [
-    "SetUpNFSSourceTask",
-    "SetUpNFSSourceResult"
+    "SetUpNFSSourceResult",
+    "SetUpNFSSourceTask"
 ]
 
 SetUpNFSSourceResult = namedtuple(

diff --git a/pyanaconda/modules/payloads/source/source_base.py b/pyanaconda/modules/payloads/source/source_base.py
@@ -31,8 +31,8 @@
 from pyanaconda.modules.payloads.source.utils import MountPointGenerator
 
 __all__ = [
-    "PayloadSourceBase",
     "MountingSourceMixin",
+    "PayloadSourceBase",
     "RPMSourceMixin",
     "RepositorySourceMixin"
 ]

diff --git a/pyanaconda/modules/services/installation.py b/pyanaconda/modules/services/installation.py
@@ -29,8 +29,12 @@
 from pyanaconda.anaconda_loggers import get_module_logger
 log = get_module_logger(__name__)
 
-__all__ = ["ConfigureInitialSetupTask", "ConfigureServicesTask",
-           "ConfigureSystemdDefaultTargetTask", "ConfigureDefaultDesktopTask"]
+__all__ = [
+    "ConfigureDefaultDesktopTask",
+    "ConfigureInitialSetupTask",
+    "ConfigureServicesTask",
+    "ConfigureSystemdDefaultTargetTask",
+]
 
 
 class ConfigureInitialSetupTask(Task):

diff --git a/pyanaconda/modules/storage/bootloader/base.py b/pyanaconda/modules/storage/bootloader/base.py
@@ -46,7 +46,7 @@
 
 log = get_module_logger(__name__)
 
-__all__ = ["BootLoaderError", "BootLoaderArguments", "BootLoader"]
+__all__ = ["BootLoader", "BootLoaderArguments", "BootLoaderError"]
 
 
 def _is_on_sw_iscsi(device):

diff --git a/pyanaconda/modules/storage/bootloader/efi.py b/pyanaconda/modules/storage/bootloader/efi.py
@@ -31,7 +31,8 @@
 from pyanaconda.anaconda_loggers import get_module_logger
 log = get_module_logger(__name__)
 
-__all__ = ["EFIBase", "EFIGRUB", "Aarch64EFIGRUB", "ArmEFIGRUB", "Aarch64EFISystemdBoot", "X64EFISystemdBoot"]
+__all__ = ["EFIGRUB", "Aarch64EFIGRUB", "Aarch64EFISystemdBoot",
+           "ArmEFIGRUB", "EFIBase", "X64EFISystemdBoot"]
 
 
 class EFIBase(object):

diff --git a/pyanaconda/modules/storage/bootloader/installation.py b/pyanaconda/modules/storage/bootloader/installation.py
@@ -36,9 +36,16 @@
 log = get_module_logger(__name__)
 
 
-__all__ = ["ConfigureBootloaderTask", "InstallBootloaderTask", "FixBTRFSBootloaderTask",
-           "FixZIPLBootloaderTask", "RecreateInitrdsTask", "CreateRescueImagesTask",
-           "CreateBLSEntriesTask", "CollectKernelArgumentsTask"]
+__all__ = [
+    "CollectKernelArgumentsTask",
+    "ConfigureBootloaderTask",
+    "CreateBLSEntriesTask",
+    "CreateRescueImagesTask",
+    "FixBTRFSBootloaderTask",
+    "FixZIPLBootloaderTask",
+    "InstallBootloaderTask",
+    "RecreateInitrdsTask",
+]
 
 
 class CreateRescueImagesTask(Task):