Skip to content

Commit 6ea35bb

Browse files
committed
Enable unreachable code checks in lib/ with mypy
1 parent 2cf7c85 commit 6ea35bb

8 files changed

Lines changed: 4 additions & 19 deletions

File tree

archinstall/lib/disk/disk_menu.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -176,20 +176,13 @@ def _select_btrfs_snapshots(self, preset: SnapshotConfig | None) -> SnapshotConf
176176
alignment=Alignment.CENTER,
177177
).run()
178178

179-
snapshot_type: SnapshotType | None = None
180-
181179
match result.type_:
182180
case ResultType.Skip:
183181
return preset
184182
case ResultType.Reset:
185183
return None
186184
case ResultType.Selection:
187-
snapshot_type = result.get_value()
188-
189-
if not snapshot_type:
190-
return None
191-
192-
return SnapshotConfig(snapshot_type=snapshot_type)
185+
return SnapshotConfig(snapshot_type=result.get_value())
193186

194187
def _prev_disk_layouts(self, item: MenuItem) -> str | None:
195188
if not item.value:

archinstall/lib/interactions/network_menu.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ def ask_to_configure_network(preset: NetworkConfiguration | None) -> NetworkConf
186186
if preset:
187187
group.set_selected_by_value(preset.type)
188188

189-
result = SelectMenu[NetworkConfiguration](
189+
result = SelectMenu[NicType](
190190
group,
191191
alignment=Alignment.CENTER,
192192
frame=FrameProperties.min(tr('Network configuration')),

archinstall/lib/interactions/system_conf.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,5 +174,3 @@ def ask_for_swap(preset: bool = True) -> bool:
174174
return result.item() == MenuItem.yes()
175175
case ResultType.Reset:
176176
raise ValueError('Unhandled result type')
177-
178-
return preset

archinstall/lib/locale/locale_menu.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,5 +149,3 @@ def select_kb_layout(preset: str | None = None) -> str | None:
149149
return preset
150150
case _:
151151
raise ValueError('Unhandled return type')
152-
153-
return None

archinstall/lib/models/device_model.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1490,9 +1490,8 @@ def __post_init__(self) -> None:
14901490
def should_generate_encryption_file(self, dev: PartitionModification | LvmVolume) -> bool:
14911491
if isinstance(dev, PartitionModification):
14921492
return dev in self.partitions and dev.mountpoint != Path('/')
1493-
elif isinstance(dev, LvmVolume):
1493+
else:
14941494
return dev in self.lvm_volumes and dev.mountpoint != Path('/')
1495-
return False
14961495

14971496
def json(self) -> _DiskEncryptionSerialization:
14981497
obj: _DiskEncryptionSerialization = {

archinstall/lib/output.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def _get_values(
4646
elif is_dataclass(o):
4747
return asdict(o)
4848
else:
49-
return o.__dict__
49+
return o.__dict__ # type: ignore[unreachable]
5050

5151
@classmethod
5252
def as_table(

archinstall/lib/profile/profile_menu.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,5 +237,3 @@ def select_profile(
237237
pass
238238

239239
return current_profile
240-
241-
return None

pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ module = "archinstall.lib.*"
100100
disallow_incomplete_defs = false
101101
disallow_untyped_defs = false
102102
warn_return_any = false
103-
warn_unreachable = false
104103

105104
[[tool.mypy.overrides]]
106105
module = "archinstall.lib.disk.*"

0 commit comments

Comments
 (0)