Skip to content

Commit 80ad332

Browse files
correctmostcorrectmost
authored
Enable multiple-statements-on-one-line-colon rule and fix warnings (#2845)
1 parent f783042 commit 80ad332

6 files changed

Lines changed: 80 additions & 41 deletions

File tree

‎archinstall/lib/disk/device_model.py‎

Lines changed: 32 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,12 @@ class DiskLayoutType(Enum):
3030

3131
def display_msg(self) -> str:
3232
match self:
33-
case DiskLayoutType.Default: return str(_('Use a best-effort default partition layout'))
34-
case DiskLayoutType.Manual: return str(_('Manual Partitioning'))
35-
case DiskLayoutType.Pre_mount: return str(_('Pre-mounted configuration'))
33+
case DiskLayoutType.Default:
34+
return str(_('Use a best-effort default partition layout'))
35+
case DiskLayoutType.Manual:
36+
return str(_('Manual Partitioning'))
37+
case DiskLayoutType.Pre_mount:
38+
return str(_('Pre-mounted configuration'))
3639

3740

3841
@dataclass
@@ -613,35 +616,48 @@ def is_crypto(self) -> bool:
613616
@property
614617
def fs_type_mount(self) -> str:
615618
match self:
616-
case FilesystemType.Ntfs: return 'ntfs3'
617-
case FilesystemType.Fat32: return 'vfat'
618-
case _: return self.value
619+
case FilesystemType.Ntfs:
620+
return 'ntfs3'
621+
case FilesystemType.Fat32:
622+
return 'vfat'
623+
case _:
624+
return self.value
619625

620626
@property
621627
def installation_pkg(self) -> Optional[str]:
622628
match self:
623-
case FilesystemType.Btrfs: return 'btrfs-progs'
624-
case FilesystemType.Xfs: return 'xfsprogs'
625-
case FilesystemType.F2fs: return 'f2fs-tools'
626-
case _: return None
629+
case FilesystemType.Btrfs:
630+
return 'btrfs-progs'
631+
case FilesystemType.Xfs:
632+
return 'xfsprogs'
633+
case FilesystemType.F2fs:
634+
return 'f2fs-tools'
635+
case _:
636+
return None
627637

628638
@property
629639
def installation_module(self) -> Optional[str]:
630640
match self:
631-
case FilesystemType.Btrfs: return 'btrfs'
632-
case _: return None
641+
case FilesystemType.Btrfs:
642+
return 'btrfs'
643+
case _:
644+
return None
633645

634646
@property
635647
def installation_binary(self) -> Optional[str]:
636648
match self:
637-
case FilesystemType.Btrfs: return '/usr/bin/btrfs'
638-
case _: return None
649+
case FilesystemType.Btrfs:
650+
return '/usr/bin/btrfs'
651+
case _:
652+
return None
639653

640654
@property
641655
def installation_hooks(self) -> Optional[str]:
642656
match self:
643-
case FilesystemType.Btrfs: return 'btrfs'
644-
case _: return None
657+
case FilesystemType.Btrfs:
658+
return 'btrfs'
659+
case _:
660+
return None
645661

646662

647663
class ModificationStatus(Enum):

‎archinstall/lib/disk/encryption_menu.py‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -233,8 +233,10 @@ def select_encryption_type(disk_config: DiskLayoutConfiguration, preset: Encrypt
233233
).run()
234234

235235
match result.type_:
236-
case ResultType.Reset: return None
237-
case ResultType.Skip: return preset
236+
case ResultType.Reset:
237+
return None
238+
case ResultType.Skip:
239+
return preset
238240
case ResultType.Selection:
239241
return result.get_value()
240242

@@ -269,8 +271,10 @@ def select_hsm(preset: Fido2Device | None = None) -> Fido2Device | None:
269271
).run()
270272

271273
match result.type_:
272-
case ResultType.Reset: return None
273-
case ResultType.Skip: return preset
274+
case ResultType.Reset:
275+
return None
276+
case ResultType.Skip:
277+
return preset
274278
case ResultType.Selection:
275279
return result.get_value()
276280

@@ -301,8 +305,10 @@ def select_partitions_to_encrypt(
301305
).run()
302306

303307
match result.type_:
304-
case ResultType.Reset: return []
305-
case ResultType.Skip: return preset
308+
case ResultType.Reset:
309+
return []
310+
case ResultType.Skip:
311+
return preset
306312
case ResultType.Selection:
307313
partitions = result.get_values()
308314
return partitions
@@ -327,8 +333,10 @@ def select_lvm_vols_to_encrypt(
327333
).run()
328334

329335
match result.type_:
330-
case ResultType.Reset: return []
331-
case ResultType.Skip: return preset
336+
case ResultType.Reset:
337+
return []
338+
case ResultType.Skip:
339+
return preset
332340
case ResultType.Selection:
333341
volumes = result.get_values()
334342
return volumes

‎archinstall/lib/interactions/disk_conf.py‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,10 @@ def _preview_device_selection(selection: disk._DeviceInfo) -> str | None:
4646
).run()
4747

4848
match result.type_:
49-
case ResultType.Reset: return []
50-
case ResultType.Skip: return preset
49+
case ResultType.Reset:
50+
return []
51+
case ResultType.Skip:
52+
return preset
5153
case ResultType.Selection:
5254
selected_device_info: list[disk._DeviceInfo] = result.get_values()
5355
selected_devices = []
@@ -123,8 +125,10 @@ def select_disk_config(
123125
).run()
124126

125127
match result.type_:
126-
case ResultType.Skip: return preset
127-
case ResultType.Reset: return None
128+
case ResultType.Skip:
129+
return preset
130+
case ResultType.Reset:
131+
return None
128132
case ResultType.Selection:
129133
selection = result.get_value()
130134

@@ -191,8 +195,10 @@ def select_lvm_config(
191195
).run()
192196

193197
match result.type_:
194-
case ResultType.Skip: return preset
195-
case ResultType.Reset: return None
198+
case ResultType.Skip:
199+
return preset
200+
case ResultType.Reset:
201+
return None
196202
case ResultType.Selection:
197203
if result.get_value() == default_mode:
198204
return suggest_lvm_layout(disk_config)

‎archinstall/lib/interactions/system_conf.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@ def ask_for_uki(preset: bool = True) -> bool:
9999
).run()
100100

101101
match result.type_:
102-
case ResultType.Skip: return preset
102+
case ResultType.Skip:
103+
return preset
103104
case ResultType.Selection:
104105
return result.item() == MenuItem.yes()
105106
case ResultType.Reset:
@@ -172,7 +173,8 @@ def ask_for_swap(preset: bool = True) -> bool:
172173
).run()
173174

174175
match result.type_:
175-
case ResultType.Skip: return preset
176+
case ResultType.Skip:
177+
return preset
176178
case ResultType.Selection:
177179
return result.item() == MenuItem.yes()
178180
case ResultType.Reset:

‎archinstall/lib/models/users.py‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,25 @@ class PasswordStrength(Enum):
1515
@property
1616
def value(self) -> str: # pylint: disable=invalid-overridden-method
1717
match self:
18-
case PasswordStrength.VERY_WEAK: return str(_('very weak'))
19-
case PasswordStrength.WEAK: return str(_('weak'))
20-
case PasswordStrength.MODERATE: return str(_('moderate'))
21-
case PasswordStrength.STRONG: return str(_('strong'))
18+
case PasswordStrength.VERY_WEAK:
19+
return str(_('very weak'))
20+
case PasswordStrength.WEAK:
21+
return str(_('weak'))
22+
case PasswordStrength.MODERATE:
23+
return str(_('moderate'))
24+
case PasswordStrength.STRONG:
25+
return str(_('strong'))
2226

2327
def color(self) -> str:
2428
match self:
25-
case PasswordStrength.VERY_WEAK: return 'red'
26-
case PasswordStrength.WEAK: return 'red'
27-
case PasswordStrength.MODERATE: return 'yellow'
28-
case PasswordStrength.STRONG: return 'green'
29+
case PasswordStrength.VERY_WEAK:
30+
return 'red'
31+
case PasswordStrength.WEAK:
32+
return 'red'
33+
case PasswordStrength.MODERATE:
34+
return 'yellow'
35+
case PasswordStrength.STRONG:
36+
return 'green'
2937

3038
@classmethod
3139
def strength(cls, password: str) -> 'PasswordStrength':

‎pyproject.toml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,6 @@ select = [
192192
]
193193

194194
ignore = [
195-
"E701", # multiple-statements-on-one-line-colon
196195
"E722", # bare-except
197196
"PLW2901", # redefined-loop-name
198197
"UP006", # non-pep585-annotation

0 commit comments

Comments
 (0)