Sort and format imports in lib/disk/ (#2875)

archinstall/lib/disk/__init__.py

@@ -1,47 +1,43 @@
 from .device_handler import device_handler, disk_layouts
-from .fido import Fido2
-from .filesystem import FilesystemHandler
-from .subvolume_menu import SubvolumeMenu
-from .partitioning_menu import (
-	manual_partitioning,
-	PartitioningList
-)
 from .device_model import (
-	_DeviceInfo,
 	BDevice,
-	DiskLayoutType,
-	DiskLayoutConfiguration,
-	LvmLayoutType,
-	LvmConfiguration,
-	LvmVolumeGroup,
-	LvmVolume,
-	LvmVolumeStatus,
-	PartitionTable,
-	Unit,
-	Size,
-	SectorSize,
-	SubvolumeModification,
 	DeviceGeometry,
-	PartitionType,
-	PartitionFlag,
-	FilesystemType,
-	ModificationStatus,
-	PartitionModification,
 	DeviceModification,
-	EncryptionType,
 	DiskEncryption,
+	DiskLayoutConfiguration,
+	DiskLayoutType,
+	EncryptionType,
 	Fido2Device,
+	FilesystemType,
 	LsblkInfo,
-	get_lsblk_info,
+	LvmConfiguration,
+	LvmLayoutType,
+	LvmVolume,
+	LvmVolumeGroup,
+	LvmVolumeStatus,
+	ModificationStatus,
+	PartitionFlag,
+	PartitionModification,
+	PartitionTable,
+	PartitionType,
+	SectorSize,
+	Size,
+	SubvolumeModification,
+	Unit,
+	_DeviceInfo,
 	get_all_lsblk_info,
 	get_lsblk_by_mountpoint,
+	get_lsblk_info,
 )
+from .disk_menu import DiskLayoutConfigurationMenu
 from .encryption_menu import (
-	select_encryption_type,
+	DiskEncryptionMenu,
 	select_encrypted_password,
+	select_encryption_type,
 	select_hsm,
 	select_partitions_to_encrypt,
-	DiskEncryptionMenu,
 )
-
+from .fido import Fido2
-from .disk_menu import DiskLayoutConfigurationMenu
+from .filesystem import FilesystemHandler
+from .partitioning_menu import PartitioningList, manual_partitioning
+from .subvolume_menu import SubvolumeMenu

archinstall/lib/disk/device_handler.py

@@ -1,34 +1,47 @@
 from __future__ import annotations
 
 import json
-import os
 import logging
+import os
 import time
 import uuid
 from collections.abc import Iterable
 from pathlib import Path
-from typing import Any, TYPE_CHECKING, Literal
+from typing import TYPE_CHECKING, Any, Literal
 
-from parted import (
+from parted import Device, Disk, DiskException, FileSystem, Geometry, IOException, Partition, PartitionException, freshDisk, getAllDevices, getDevice, newDisk
-	Disk, Geometry, FileSystem,
-	PartitionException, DiskException, IOException,
-	getDevice, getAllDevices, newDisk, freshDisk, Partition, Device
-)
-
-from .device_model import (
-	DeviceModification, PartitionModification,
-	BDevice, _DeviceInfo, _PartitionInfo,
-	FilesystemType, Unit, PartitionTable,
-	ModificationStatus, get_lsblk_info, find_lsblk_info, LsblkInfo,
-	_BtrfsSubvolumeInfo, get_all_lsblk_info, DiskEncryption, LvmVolumeGroup, LvmVolume, Size, LvmGroupInfo,
-	SectorSize, LvmVolumeInfo, LvmPVInfo, SubvolumeModification, BtrfsMountOption
-)
 
 from ..exceptions import DiskError, UnknownFilesystemFormat
-from ..general import SysCommand, SysCallError, JSON, SysCommandWorker
+from ..general import JSON, SysCallError, SysCommand, SysCommandWorker
 from ..luks import Luks2
-from ..output import debug, error, info, warn, log
+from ..output import debug, error, info, log, warn
 from ..utils.util import is_subpath
+from .device_model import (
+	BDevice,
+	BtrfsMountOption,
+	DeviceModification,
+	DiskEncryption,
+	FilesystemType,
+	LsblkInfo,
+	LvmGroupInfo,
+	LvmPVInfo,
+	LvmVolume,
+	LvmVolumeGroup,
+	LvmVolumeInfo,
+	ModificationStatus,
+	PartitionModification,
+	PartitionTable,
+	SectorSize,
+	Size,
+	SubvolumeModification,
+	Unit,
+	_BtrfsSubvolumeInfo,
+	_DeviceInfo,
+	_PartitionInfo,
+	find_lsblk_info,
+	get_all_lsblk_info,
+	get_lsblk_info,
+)
 
 if TYPE_CHECKING:
 	_: Any

archinstall/lib/disk/disk_menu.py

@@ -1,18 +1,14 @@
-from typing import Any, TYPE_CHECKING
+from typing import TYPE_CHECKING, Any
 
-from . import DiskLayoutConfiguration, DiskLayoutType
+from archinstall.tui import MenuItem, MenuItemGroup
-from .device_model import LvmConfiguration
+
-from ..disk import (
+from ..disk import DeviceModification
-	DeviceModification
-)
 from ..interactions import select_disk_config
 from ..interactions.disk_conf import select_lvm_config
-from ..output import FormattedOutput
 from ..menu import AbstractSubMenu
-
+from ..output import FormattedOutput
-from archinstall.tui import (
+from . import DiskLayoutConfiguration, DiskLayoutType
-	MenuItemGroup, MenuItem
+from .device_model import LvmConfiguration
-)
 
 if TYPE_CHECKING:
 	_: Any

archinstall/lib/disk/encryption_menu.py

@@ -1,25 +1,15 @@
 from pathlib import Path
-from typing import Any, TYPE_CHECKING
+from typing import TYPE_CHECKING, Any
 
-from . import LvmConfiguration, LvmVolume
+from archinstall.lib.menu.menu_helper import MenuHelper
-from ..disk import (
+from archinstall.tui import Alignment, FrameProperties, MenuItem, MenuItemGroup, ResultType, SelectMenu
-	DeviceModification,
+
-	DiskLayoutConfiguration,
+from ..disk import DeviceModification, DiskEncryption, DiskLayoutConfiguration, EncryptionType, PartitionModification
-	PartitionModification,
-	DiskEncryption,
-	EncryptionType
-)
 from ..menu import AbstractSubMenu
-from .fido import Fido2Device, Fido2
 from ..output import FormattedOutput
 from ..utils.util import get_password
-
+from . import LvmConfiguration, LvmVolume
-from archinstall.tui import (
+from .fido import Fido2, Fido2Device
-	MenuItemGroup, MenuItem, SelectMenu,
-	FrameProperties, Alignment, ResultType
-)
-from archinstall.lib.menu.menu_helper import MenuHelper
-
 
 if TYPE_CHECKING:
 	_: Any

archinstall/lib/disk/fido.py

@@ -3,10 +3,10 @@ from __future__ import annotations
 import getpass
 from pathlib import Path
 
-from .device_model import Fido2Device
+from ..exceptions import SysCallError
 from ..general import SysCommand, SysCommandWorker, clear_vt100_escape_codes
 from ..output import error, info
-from ..exceptions import SysCallError
+from .device_model import Fido2Device
 
 
 class Fido2:

archinstall/lib/disk/filesystem.py

@@ -2,24 +2,31 @@ from __future__ import annotations
 
 import time
 from pathlib import Path
-from typing import Any, TYPE_CHECKING
+from typing import TYPE_CHECKING, Any
+
+from archinstall.tui import Tui
 
-from ..interactions.general_conf import ask_abort
-from .device_handler import device_handler
-from .device_model import (
-	DiskLayoutConfiguration, DiskLayoutType, PartitionTable,
-	FilesystemType, DiskEncryption, LvmVolumeGroup,
-	Size, Unit, SectorSize, PartitionModification, EncryptionType,
-	LvmVolume, LvmConfiguration
-)
 from ..hardware import SysInfo
+from ..interactions.general_conf import ask_abort
 from ..luks import Luks2
 from ..output import debug, info
-from archinstall.tui import (
+from .device_handler import device_handler
-	Tui
+from .device_model import (
+	DiskEncryption,
+	DiskLayoutConfiguration,
+	DiskLayoutType,
+	EncryptionType,
+	FilesystemType,
+	LvmConfiguration,
+	LvmVolume,
+	LvmVolumeGroup,
+	PartitionModification,
+	PartitionTable,
+	SectorSize,
+	Size,
+	Unit,
 )
 
-
 if TYPE_CHECKING:
 	_: Any
 

archinstall/lib/disk/partitioning_menu.py

@@ -1,26 +1,30 @@
 from __future__ import annotations
 
 import re
-from pathlib import Path
-from typing import Any, TYPE_CHECKING
 from dataclasses import dataclass
+from pathlib import Path
+from typing import TYPE_CHECKING, Any
+
+from archinstall.tui import Alignment, EditMenu, FrameProperties, MenuItem, MenuItemGroup, Orientation, ResultType, SelectMenu
 
-from ..utils.util import prompt_dir
-from .device_model import (
-	PartitionModification, FilesystemType, BDevice,
-	Size, Unit, PartitionType, PartitionFlag,
-	ModificationStatus, DeviceGeometry, SectorSize, BtrfsMountOption
-)
 from ..hardware import SysInfo
 from ..menu import ListManager
 from ..output import FormattedOutput
-from .subvolume_menu import SubvolumeMenu
+from ..utils.util import prompt_dir
-
+from .device_model import (
-from archinstall.tui import (
+	BDevice,
-	MenuItemGroup, MenuItem, SelectMenu,
+	BtrfsMountOption,
-	FrameProperties, Alignment, EditMenu,
+	DeviceGeometry,
-	Orientation, ResultType
+	FilesystemType,
+	ModificationStatus,
+	PartitionFlag,
+	PartitionModification,
+	PartitionType,
+	SectorSize,
+	Size,
+	Unit,
 )
+from .subvolume_menu import SubvolumeMenu
 
 if TYPE_CHECKING:
 	_: Any

archinstall/lib/disk/subvolume_menu.py

@@ -1,13 +1,11 @@
 from pathlib import Path
-from typing import Any, TYPE_CHECKING
+from typing import TYPE_CHECKING, Any
+
+from archinstall.tui import Alignment, EditMenu, ResultType
 
-from .device_model import SubvolumeModification
 from ..menu import ListManager
 from ..utils.util import prompt_dir
-
+from .device_model import SubvolumeModification
-from archinstall.tui import (
-	Alignment, EditMenu, ResultType
-)
 
 if TYPE_CHECKING:
 	_: Any