Enable multiple-statements-on-one-line-colon rule and fix warnings (#2845)

archinstall/lib/disk/device_model.py

@@ -30,9 +30,12 @@ class DiskLayoutType(Enum):
 
 	def display_msg(self) -> str:
 		match self:
-			case DiskLayoutType.Default: return str(_('Use a best-effort default partition layout'))
-			case DiskLayoutType.Manual: return str(_('Manual Partitioning'))
-			case DiskLayoutType.Pre_mount: return str(_('Pre-mounted configuration'))
+			case DiskLayoutType.Default:
+				return str(_('Use a best-effort default partition layout'))
+			case DiskLayoutType.Manual:
+				return str(_('Manual Partitioning'))
+			case DiskLayoutType.Pre_mount:
+				return str(_('Pre-mounted configuration'))
 
 
 @dataclass
@@ -613,35 +616,48 @@ class FilesystemType(Enum):
 	@property
 	def fs_type_mount(self) -> str:
 		match self:
-			case FilesystemType.Ntfs: return 'ntfs3'
-			case FilesystemType.Fat32: return 'vfat'
-			case _: return self.value
+			case FilesystemType.Ntfs:
+				return 'ntfs3'
+			case FilesystemType.Fat32:
+				return 'vfat'
+			case _:
+				return self.value
 
 	@property
 	def installation_pkg(self) -> Optional[str]:
 		match self:
-			case FilesystemType.Btrfs: return 'btrfs-progs'
-			case FilesystemType.Xfs: return 'xfsprogs'
-			case FilesystemType.F2fs: return 'f2fs-tools'
-			case _: return None
+			case FilesystemType.Btrfs:
+				return 'btrfs-progs'
+			case FilesystemType.Xfs:
+				return 'xfsprogs'
+			case FilesystemType.F2fs:
+				return 'f2fs-tools'
+			case _:
+				return None
 
 	@property
 	def installation_module(self) -> Optional[str]:
 		match self:
-			case FilesystemType.Btrfs: return 'btrfs'
-			case _: return None
+			case FilesystemType.Btrfs:
+				return 'btrfs'
+			case _:
+				return None
 
 	@property
 	def installation_binary(self) -> Optional[str]:
 		match self:
-			case FilesystemType.Btrfs: return '/usr/bin/btrfs'
-			case _: return None
+			case FilesystemType.Btrfs:
+				return '/usr/bin/btrfs'
+			case _:
+				return None
 
 	@property
 	def installation_hooks(self) -> Optional[str]:
 		match self:
-			case FilesystemType.Btrfs: return 'btrfs'
-			case _: return None
+			case FilesystemType.Btrfs:
+				return 'btrfs'
+			case _:
+				return None
 
 
 class ModificationStatus(Enum):

archinstall/lib/disk/encryption_menu.py

@@ -233,8 +233,10 @@ def select_encryption_type(disk_config: DiskLayoutConfiguration, preset: Encrypt
 	).run()
 
 	match result.type_:
-		case ResultType.Reset: return None
-		case ResultType.Skip: return preset
+		case ResultType.Reset:
+			return None
+		case ResultType.Skip:
+			return preset
 		case ResultType.Selection:
 			return result.get_value()
 
@@ -269,8 +271,10 @@ def select_hsm(preset: Fido2Device | None = None) -> Fido2Device | None:
 		).run()
 
 		match result.type_:
-			case ResultType.Reset: return None
-			case ResultType.Skip: return preset
+			case ResultType.Reset:
+				return None
+			case ResultType.Skip:
+				return preset
 			case ResultType.Selection:
 				return result.get_value()
 
@@ -301,8 +305,10 @@ def select_partitions_to_encrypt(
 		).run()
 
 		match result.type_:
-			case ResultType.Reset: return []
-			case ResultType.Skip: return preset
+			case ResultType.Reset:
+				return []
+			case ResultType.Skip:
+				return preset
 			case ResultType.Selection:
 				partitions = result.get_values()
 				return partitions
@@ -327,8 +333,10 @@ def select_lvm_vols_to_encrypt(
 		).run()
 
 		match result.type_:
-			case ResultType.Reset: return []
-			case ResultType.Skip: return preset
+			case ResultType.Reset:
+				return []
+			case ResultType.Skip:
+				return preset
 			case ResultType.Selection:
 				volumes = result.get_values()
 				return volumes

archinstall/lib/interactions/disk_conf.py

@@ -46,8 +46,10 @@ def select_devices(preset: list[disk.BDevice] | None = []) -> list[disk.BDevice]
 	).run()
 
 	match result.type_:
-		case ResultType.Reset: return []
-		case ResultType.Skip: return preset
+		case ResultType.Reset:
+			return []
+		case ResultType.Skip:
+			return preset
 		case ResultType.Selection:
 			selected_device_info: list[disk._DeviceInfo] = result.get_values()
 			selected_devices = []
@@ -123,8 +125,10 @@ def select_disk_config(
 	).run()
 
 	match result.type_:
-		case ResultType.Skip: return preset
-		case ResultType.Reset: return None
+		case ResultType.Skip:
+			return preset
+		case ResultType.Reset:
+			return None
 		case ResultType.Selection:
 			selection = result.get_value()
 
@@ -191,8 +195,10 @@ def select_lvm_config(
 	).run()
 
 	match result.type_:
-		case ResultType.Skip: return preset
-		case ResultType.Reset: return None
+		case ResultType.Skip:
+			return preset
+		case ResultType.Reset:
+			return None
 		case ResultType.Selection:
 			if result.get_value() == default_mode:
 				return suggest_lvm_layout(disk_config)

archinstall/lib/interactions/system_conf.py

@@ -99,7 +99,8 @@ def ask_for_uki(preset: bool = True) -> bool:
 	).run()
 
 	match result.type_:
-		case ResultType.Skip: return preset
+		case ResultType.Skip:
+			return preset
 		case ResultType.Selection:
 			return result.item() == MenuItem.yes()
 		case ResultType.Reset:
@@ -172,7 +173,8 @@ def ask_for_swap(preset: bool = True) -> bool:
 	).run()
 
 	match result.type_:
-		case ResultType.Skip: return preset
+		case ResultType.Skip:
+			return preset
 		case ResultType.Selection:
 			return result.item() == MenuItem.yes()
 		case ResultType.Reset:

archinstall/lib/models/users.py

@@ -15,17 +15,25 @@ class PasswordStrength(Enum):
 	@property
 	def value(self) -> str:  # pylint: disable=invalid-overridden-method
 		match self:
-			case PasswordStrength.VERY_WEAK: return str(_('very weak'))
-			case PasswordStrength.WEAK: return str(_('weak'))
-			case PasswordStrength.MODERATE: return str(_('moderate'))
-			case PasswordStrength.STRONG: return str(_('strong'))
+			case PasswordStrength.VERY_WEAK:
+				return str(_('very weak'))
+			case PasswordStrength.WEAK:
+				return str(_('weak'))
+			case PasswordStrength.MODERATE:
+				return str(_('moderate'))
+			case PasswordStrength.STRONG:
+				return str(_('strong'))
 
 	def color(self) -> str:
 		match self:
-			case PasswordStrength.VERY_WEAK: return 'red'
-			case PasswordStrength.WEAK: return 'red'
-			case PasswordStrength.MODERATE: return 'yellow'
-			case PasswordStrength.STRONG: return 'green'
+			case PasswordStrength.VERY_WEAK:
+				return 'red'
+			case PasswordStrength.WEAK:
+				return 'red'
+			case PasswordStrength.MODERATE:
+				return 'yellow'
+			case PasswordStrength.STRONG:
+				return 'green'
 
 	@classmethod
 	def strength(cls, password: str) -> 'PasswordStrength':

pyproject.toml

@@ -192,7 +192,6 @@ select = [
 ]
 
 ignore = [
-    "E701",     # multiple-statements-on-one-line-colon
     "E722",     # bare-except
     "PLW2901",  # redefined-loop-name
     "UP006",    # non-pep585-annotation