Skip to content

Commit dc98efb

Browse files
committed
Refactor default PartitionTable
Addresses the following: pyright ``` archinstall/lib/models/device.py:262:10 - error: Type "Literal[PartitionTable.GPT, PartitionTable.MBR]" is not assignable to return type "Self@PartitionTable"   Type "Literal[PartitionTable.GPT, PartitionTable.MBR]" is not assignable to type "Self@PartitionTable" (reportReturnType) ``` ty ``` error[invalid-return-type]: Return type does not match returned value --> archinstall/lib/models/device.py:261:22 | 261 | def default(cls) -> Self: | ---- Expected `Self@default` because of return type 262 | return cls.GPT if SysInfo.has_uefi() else cls.MBR | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `Self@default`, found `PartitionTable` | ```
1 parent d43da6a commit dc98efb

2 files changed

Lines changed: 2 additions & 6 deletions

File tree

archinstall/lib/disk/device_handler.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
umount,
1818
)
1919
from archinstall.lib.exceptions import DiskError, SysCallError, UnknownFilesystemFormat
20+
from archinstall.lib.hardware import SysInfo
2021
from archinstall.lib.log import debug, error, info, log
2122
from archinstall.lib.models.device import (
2223
DEFAULT_ITER_TIME,
@@ -45,7 +46,7 @@ class DeviceHandler:
4546

4647
def __init__(self) -> None:
4748
self._devices: dict[Path, BDevice] = {}
48-
self._partition_table = PartitionTable.default()
49+
self._partition_table = PartitionTable.GPT if SysInfo.has_uefi() else PartitionTable.MBR
4950
self.load_devices()
5051

5152
@property

archinstall/lib/models/device.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
from parted import Disk, Geometry, Partition
1212
from pydantic import BaseModel, Field, ValidationInfo, field_serializer, field_validator
1313

14-
from archinstall.lib.hardware import SysInfo
1514
from archinstall.lib.log import debug
1615
from archinstall.lib.models.config import SubConfig
1716
from archinstall.lib.models.users import Password
@@ -257,10 +256,6 @@ def is_gpt(self) -> bool:
257256
def is_mbr(self) -> bool:
258257
return self == PartitionTable.MBR
259258

260-
@classmethod
261-
def default(cls) -> Self:
262-
return cls.GPT if SysInfo.has_uefi() else cls.MBR
263-
264259

265260
class Units(Enum):
266261
BINARY = 'binary'

0 commit comments

Comments
 (0)