Skip to content

Commit 9c63392

Browse files
correctmostcorrectmost
authored
Remove extraneous inline type annotations (#3418)
1 parent e8fd1de commit 9c63392

8 files changed

Lines changed: 28 additions & 42 deletions

File tree

‎archinstall/lib/menu/list_manager.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def __init__(
4040
self._original_data = copy.deepcopy(entries)
4141
self._data = copy.deepcopy(entries)
4242

43-
self._prompt: str | None = prompt
43+
self._prompt = prompt
4444

4545
self._separator = ''
4646
self._confirm_action = str(_('Confirm and exit'))

‎archinstall/lib/output.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ def log(
321321
if _supports_color():
322322
text = _stylize_output(text, fg, bg, reset, font)
323323

324-
log_file: Path = storage['LOG_PATH'] / storage['LOG_FILE']
324+
log_file = storage['LOG_PATH'] / storage['LOG_FILE']
325325

326326
with log_file.open('a') as fp:
327327
ts = _timestamp()

‎archinstall/scripts/guided.py‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,18 @@
22
from pathlib import Path
33

44
from archinstall import SysInfo
5-
from archinstall.lib.args import ArchConfig, arch_config_handler
5+
from archinstall.lib.args import arch_config_handler
66
from archinstall.lib.configuration import ConfigurationOutput
77
from archinstall.lib.disk.filesystem import FilesystemHandler
88
from archinstall.lib.disk.utils import disk_layouts
99
from archinstall.lib.global_menu import GlobalMenu
1010
from archinstall.lib.installer import Installer, accessibility_tools_in_use, run_custom_user_commands
1111
from archinstall.lib.interactions.general_conf import PostInstallationAction, ask_post_installation
12-
from archinstall.lib.models import AudioConfiguration, Bootloader
12+
from archinstall.lib.models import Bootloader
1313
from archinstall.lib.models.device_model import (
14-
DiskLayoutConfiguration,
1514
DiskLayoutType,
1615
EncryptionType,
1716
)
18-
from archinstall.lib.models.network_configuration import NetworkConfiguration
1917
from archinstall.lib.models.users import User
2018
from archinstall.lib.output import debug, error, info
2119
from archinstall.lib.profile.profiles_handler import profile_handler
@@ -46,13 +44,13 @@ def perform_installation(mountpoint: Path) -> None:
4644
"""
4745
info('Starting installation...')
4846

49-
config: ArchConfig = arch_config_handler.config
47+
config = arch_config_handler.config
5048

5149
if not config.disk_config:
5250
error("No disk configuration provided")
5351
return
5452

55-
disk_config: DiskLayoutConfiguration = config.disk_config
53+
disk_config = config.disk_config
5654
run_mkinitcpio = not config.uki
5755
locale_config = config.locale_config
5856
disk_encryption = config.disk_encryption
@@ -98,7 +96,7 @@ def perform_installation(mountpoint: Path) -> None:
9896

9997
# If user selected to copy the current ISO network configuration
10098
# Perform a copy of the config
101-
network_config: NetworkConfiguration | None = config.network_config
99+
network_config = config.network_config
102100

103101
if network_config:
104102
network_config.install_network_config(
@@ -109,7 +107,7 @@ def perform_installation(mountpoint: Path) -> None:
109107
if users := config.users:
110108
installation.create_users(users)
111109

112-
audio_config: AudioConfiguration | None = config.audio_config
110+
audio_config = config.audio_config
113111
if audio_config:
114112
audio_config.install_audio_config(installation)
115113
else:

‎archinstall/scripts/minimal.py‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
from pathlib import Path
22

33
from archinstall.default_profiles.minimal import MinimalProfile
4-
from archinstall.lib.args import ArchConfig, arch_config_handler
4+
from archinstall.lib.args import arch_config_handler
55
from archinstall.lib.configuration import ConfigurationOutput
66
from archinstall.lib.disk.disk_menu import DiskLayoutConfigurationMenu
77
from archinstall.lib.disk.encryption_menu import DiskEncryptionMenu
88
from archinstall.lib.disk.filesystem import FilesystemHandler
99
from archinstall.lib.installer import Installer
1010
from archinstall.lib.models import Bootloader
11-
from archinstall.lib.models.device_model import (
12-
DiskLayoutConfiguration,
13-
)
14-
from archinstall.lib.models.network_configuration import NetworkConfiguration
1511
from archinstall.lib.models.profile_model import ProfileConfiguration
1612
from archinstall.lib.models.users import Password, User
1713
from archinstall.lib.output import debug, error, info
@@ -20,13 +16,13 @@
2016

2117

2218
def perform_installation(mountpoint: Path) -> None:
23-
config: ArchConfig = arch_config_handler.config
19+
config = arch_config_handler.config
2420

2521
if not config.disk_config:
2622
error("No disk configuration provided")
2723
return
2824

29-
disk_config: DiskLayoutConfiguration = config.disk_config
25+
disk_config = config.disk_config
3026
disk_encryption = config.disk_encryption
3127

3228
with Installer(
@@ -41,7 +37,7 @@ def perform_installation(mountpoint: Path) -> None:
4137
installation.set_hostname('minimal-arch')
4238
installation.add_bootloader(Bootloader.Systemd)
4339

44-
network_config: NetworkConfiguration | None = config.network_config
40+
network_config = config.network_config
4541

4642
if network_config:
4743
network_config.install_network_config(

‎archinstall/scripts/only_hd.py‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
from pathlib import Path
22

33
from archinstall import debug, error
4-
from archinstall.lib.args import ArchConfig, arch_config_handler
4+
from archinstall.lib.args import arch_config_handler
55
from archinstall.lib.configuration import ConfigurationOutput
66
from archinstall.lib.disk.filesystem import FilesystemHandler
77
from archinstall.lib.disk.utils import disk_layouts
88
from archinstall.lib.global_menu import GlobalMenu
99
from archinstall.lib.installer import Installer
10-
from archinstall.lib.models.device_model import (
11-
DiskLayoutConfiguration,
12-
)
1310
from archinstall.tui import Tui
1411

1512

@@ -33,13 +30,13 @@ def perform_installation(mountpoint: Path) -> None:
3330
Only requirement is that the block devices are
3431
formatted and setup prior to entering this function.
3532
"""
36-
config: ArchConfig = arch_config_handler.config
33+
config = arch_config_handler.config
3734

3835
if not config.disk_config:
3936
error("No disk configuration provided")
4037
return
4138

42-
disk_config: DiskLayoutConfiguration = config.disk_config
39+
disk_config = config.disk_config
4340
disk_encryption = config.disk_encryption
4441

4542
with Installer(

‎examples/interactive_installation.py‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,18 @@
22
from pathlib import Path
33

44
from archinstall import SysInfo, debug, error, info
5-
from archinstall.lib.args import ArchConfig, arch_config_handler
5+
from archinstall.lib.args import arch_config_handler
66
from archinstall.lib.configuration import ConfigurationOutput
77
from archinstall.lib.disk.filesystem import FilesystemHandler
88
from archinstall.lib.disk.utils import disk_layouts
99
from archinstall.lib.global_menu import GlobalMenu
1010
from archinstall.lib.installer import Installer, accessibility_tools_in_use, run_custom_user_commands
1111
from archinstall.lib.interactions.general_conf import PostInstallationAction, ask_post_installation
12-
from archinstall.lib.models import AudioConfiguration, Bootloader
12+
from archinstall.lib.models import Bootloader
1313
from archinstall.lib.models.device_model import (
14-
DiskLayoutConfiguration,
1514
DiskLayoutType,
1615
EncryptionType,
1716
)
18-
from archinstall.lib.models.network_configuration import NetworkConfiguration
1917
from archinstall.lib.models.users import User
2018
from archinstall.lib.profile.profiles_handler import profile_handler
2119
from archinstall.tui import Tui
@@ -45,13 +43,13 @@ def perform_installation(mountpoint: Path) -> None:
4543
"""
4644
info('Starting installation...')
4745

48-
config: ArchConfig = arch_config_handler.config
46+
config = arch_config_handler.config
4947

5048
if not config.disk_config:
5149
error("No disk configuration provided")
5250
return
5351

54-
disk_config: DiskLayoutConfiguration = config.disk_config
52+
disk_config = config.disk_config
5553
run_mkinitcpio = not config.uki
5654
locale_config = config.locale_config
5755
disk_encryption = config.disk_encryption
@@ -97,7 +95,7 @@ def perform_installation(mountpoint: Path) -> None:
9795

9896
# If user selected to copy the current ISO network configuration
9997
# Perform a copy of the config
100-
network_config: NetworkConfiguration | None = config.network_config
98+
network_config = config.network_config
10199

102100
if network_config:
103101
network_config.install_network_config(
@@ -108,7 +106,7 @@ def perform_installation(mountpoint: Path) -> None:
108106
if users := config.users:
109107
installation.create_users(users)
110108

111-
audio_config: AudioConfiguration | None = config.audio_config
109+
audio_config = config.audio_config
112110
if audio_config:
113111
audio_config.install_audio_config(installation)
114112
else:

‎examples/minimal_installation.py‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
from pathlib import Path
22

33
from archinstall.default_profiles.minimal import MinimalProfile
4-
from archinstall.lib.args import ArchConfig, arch_config_handler
4+
from archinstall.lib.args import arch_config_handler
55
from archinstall.lib.configuration import ConfigurationOutput
66
from archinstall.lib.disk.disk_menu import DiskLayoutConfigurationMenu
77
from archinstall.lib.disk.encryption_menu import DiskEncryptionMenu
88
from archinstall.lib.disk.filesystem import FilesystemHandler
99
from archinstall.lib.installer import Installer
1010
from archinstall.lib.models import Bootloader
11-
from archinstall.lib.models.device_model import DiskLayoutConfiguration
12-
from archinstall.lib.models.network_configuration import NetworkConfiguration
1311
from archinstall.lib.models.profile_model import ProfileConfiguration
1412
from archinstall.lib.models.users import Password, User
1513
from archinstall.lib.output import debug, error, info
@@ -18,9 +16,9 @@
1816

1917

2018
def perform_installation(mountpoint: Path) -> None:
21-
config: ArchConfig = arch_config_handler.config
19+
config = arch_config_handler.config
2220

23-
disk_config: DiskLayoutConfiguration | None = config.disk_config
21+
disk_config = config.disk_config
2422

2523
if disk_config is None:
2624
error("No disk configuration provided")
@@ -40,7 +38,7 @@ def perform_installation(mountpoint: Path) -> None:
4038
installation.set_hostname('minimal-arch')
4139
installation.add_bootloader(Bootloader.Systemd)
4240

43-
network_config: NetworkConfiguration | None = config.network_config
41+
network_config = config.network_config
4442

4543
if network_config:
4644
network_config.install_network_config(

‎examples/only_hd_installation.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
from pathlib import Path
22

3-
from archinstall.lib.args import ArchConfig, arch_config_handler
3+
from archinstall.lib.args import arch_config_handler
44
from archinstall.lib.configuration import ConfigurationOutput
55
from archinstall.lib.disk.filesystem import FilesystemHandler
66
from archinstall.lib.disk.utils import disk_layouts
77
from archinstall.lib.global_menu import GlobalMenu
88
from archinstall.lib.installer import Installer
9-
from archinstall.lib.models.device_model import DiskLayoutConfiguration
109
from archinstall.lib.output import debug, error
1110
from archinstall.tui import Tui
1211

@@ -31,13 +30,13 @@ def perform_installation(mountpoint: Path) -> None:
3130
Only requirement is that the block devices are
3231
formatted and setup prior to entering this function.
3332
"""
34-
config: ArchConfig = arch_config_handler.config
33+
config = arch_config_handler.config
3534

3635
if not config.disk_config:
3736
error("No disk configuration provided")
3837
return
3938

40-
disk_config: DiskLayoutConfiguration = config.disk_config
39+
disk_config = config.disk_config
4140
disk_encryption = config.disk_encryption
4241

4342
with Installer(

0 commit comments

Comments
 (0)