Remove some unnecessary type unions (#3378)

This commit is contained in:
correctmost 2025-04-09 12:16:23 +00:00 committed by GitHub
parent 3dd8679734
commit a9fd14fee1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
23 changed files with 31 additions and 31 deletions

View File

@ -55,7 +55,7 @@ class DesktopProfile(Profile):
profile.do_on_select() profile.do_on_select()
@override @override
def do_on_select(self) -> SelectResult | None: def do_on_select(self) -> SelectResult:
items = [ items = [
MenuItem( MenuItem(
p.name, p.name,

View File

@ -22,5 +22,5 @@ class BspwmProfile(XorgProfile):
@property @property
@override @override
def default_greeter_type(self) -> GreeterType | None: def default_greeter_type(self) -> GreeterType:
return GreeterType.Lightdm return GreeterType.Lightdm

View File

@ -21,5 +21,5 @@ class BudgieProfile(XorgProfile):
@property @property
@override @override
def default_greeter_type(self) -> GreeterType | None: def default_greeter_type(self) -> GreeterType:
return GreeterType.LightdmSlick return GreeterType.LightdmSlick

View File

@ -27,5 +27,5 @@ class CinnamonProfile(XorgProfile):
@property @property
@override @override
def default_greeter_type(self) -> GreeterType | None: def default_greeter_type(self) -> GreeterType:
return GreeterType.Lightdm return GreeterType.Lightdm

View File

@ -17,5 +17,5 @@ class CosmicProfile(XorgProfile):
@property @property
@override @override
def default_greeter_type(self) -> GreeterType | None: def default_greeter_type(self) -> GreeterType:
return GreeterType.CosmicSession return GreeterType.CosmicSession

View File

@ -18,5 +18,5 @@ class CutefishProfile(XorgProfile):
@property @property
@override @override
def default_greeter_type(self) -> GreeterType | None: def default_greeter_type(self) -> GreeterType:
return GreeterType.Sddm return GreeterType.Sddm

View File

@ -19,5 +19,5 @@ class DeepinProfile(XorgProfile):
@property @property
@override @override
def default_greeter_type(self) -> GreeterType | None: def default_greeter_type(self) -> GreeterType:
return GreeterType.Lightdm return GreeterType.Lightdm

View File

@ -18,5 +18,5 @@ class EnlighenmentProfile(XorgProfile):
@property @property
@override @override
def default_greeter_type(self) -> GreeterType | None: def default_greeter_type(self) -> GreeterType:
return GreeterType.Lightdm return GreeterType.Lightdm

View File

@ -18,5 +18,5 @@ class GnomeProfile(XorgProfile):
@property @property
@override @override
def default_greeter_type(self) -> GreeterType | None: def default_greeter_type(self) -> GreeterType:
return GreeterType.Gdm return GreeterType.Gdm

View File

@ -1,7 +1,7 @@
from typing import TYPE_CHECKING, override from typing import TYPE_CHECKING, override
from archinstall.default_profiles.desktops import SeatAccess from archinstall.default_profiles.desktops import SeatAccess
from archinstall.default_profiles.profile import GreeterType, ProfileType, SelectResult from archinstall.default_profiles.profile import GreeterType, ProfileType
from archinstall.default_profiles.xorg import XorgProfile from archinstall.default_profiles.xorg import XorgProfile
from archinstall.tui.curses_menu import SelectMenu from archinstall.tui.curses_menu import SelectMenu
from archinstall.tui.menu_item import MenuItem, MenuItemGroup from archinstall.tui.menu_item import MenuItem, MenuItemGroup
@ -40,7 +40,7 @@ class HyprlandProfile(XorgProfile):
@property @property
@override @override
def default_greeter_type(self) -> GreeterType | None: def default_greeter_type(self) -> GreeterType:
return GreeterType.Sddm return GreeterType.Sddm
@property @property
@ -74,6 +74,6 @@ class HyprlandProfile(XorgProfile):
self.custom_settings['seat_access'] = result.get_value().value self.custom_settings['seat_access'] = result.get_value().value
@override @override
def do_on_select(self) -> SelectResult | None: def do_on_select(self) -> None:
self._ask_seat_access() self._ask_seat_access()
return None return None

View File

@ -25,5 +25,5 @@ class I3wmProfile(XorgProfile):
@property @property
@override @override
def default_greeter_type(self) -> GreeterType | None: def default_greeter_type(self) -> GreeterType:
return GreeterType.Lightdm return GreeterType.Lightdm

View File

@ -1,7 +1,7 @@
from typing import TYPE_CHECKING, override from typing import TYPE_CHECKING, override
from archinstall.default_profiles.desktops import SeatAccess from archinstall.default_profiles.desktops import SeatAccess
from archinstall.default_profiles.profile import GreeterType, ProfileType, SelectResult from archinstall.default_profiles.profile import GreeterType, ProfileType
from archinstall.default_profiles.xorg import XorgProfile from archinstall.default_profiles.xorg import XorgProfile
from archinstall.tui.curses_menu import SelectMenu from archinstall.tui.curses_menu import SelectMenu
from archinstall.tui.menu_item import MenuItem, MenuItemGroup from archinstall.tui.menu_item import MenuItem, MenuItemGroup
@ -38,7 +38,7 @@ class LabwcProfile(XorgProfile):
@property @property
@override @override
def default_greeter_type(self) -> GreeterType | None: def default_greeter_type(self) -> GreeterType:
return GreeterType.Lightdm return GreeterType.Lightdm
@property @property
@ -72,6 +72,6 @@ class LabwcProfile(XorgProfile):
self.custom_settings['seat_access'] = result.get_value().value self.custom_settings['seat_access'] = result.get_value().value
@override @override
def do_on_select(self) -> SelectResult | None: def do_on_select(self) -> None:
self._ask_seat_access() self._ask_seat_access()
return None return None

View File

@ -26,5 +26,5 @@ class LxqtProfile(XorgProfile):
@property @property
@override @override
def default_greeter_type(self) -> GreeterType | None: def default_greeter_type(self) -> GreeterType:
return GreeterType.Sddm return GreeterType.Sddm

View File

@ -18,5 +18,5 @@ class MateProfile(XorgProfile):
@property @property
@override @override
def default_greeter_type(self) -> GreeterType | None: def default_greeter_type(self) -> GreeterType:
return GreeterType.Lightdm return GreeterType.Lightdm

View File

@ -1,7 +1,7 @@
from typing import TYPE_CHECKING, override from typing import TYPE_CHECKING, override
from archinstall.default_profiles.desktops import SeatAccess from archinstall.default_profiles.desktops import SeatAccess
from archinstall.default_profiles.profile import GreeterType, ProfileType, SelectResult from archinstall.default_profiles.profile import GreeterType, ProfileType
from archinstall.default_profiles.xorg import XorgProfile from archinstall.default_profiles.xorg import XorgProfile
from archinstall.tui.curses_menu import SelectMenu from archinstall.tui.curses_menu import SelectMenu
from archinstall.tui.menu_item import MenuItem, MenuItemGroup from archinstall.tui.menu_item import MenuItem, MenuItemGroup
@ -45,7 +45,7 @@ class NiriProfile(XorgProfile):
@property @property
@override @override
def default_greeter_type(self) -> GreeterType | None: def default_greeter_type(self) -> GreeterType:
return GreeterType.Lightdm return GreeterType.Lightdm
@property @property
@ -79,6 +79,6 @@ class NiriProfile(XorgProfile):
self.custom_settings['seat_access'] = result.get_value().value self.custom_settings['seat_access'] = result.get_value().value
@override @override
def do_on_select(self) -> SelectResult | None: def do_on_select(self) -> None:
self._ask_seat_access() self._ask_seat_access()
return None return None

View File

@ -22,5 +22,5 @@ class PlasmaProfile(XorgProfile):
@property @property
@override @override
def default_greeter_type(self) -> GreeterType | None: def default_greeter_type(self) -> GreeterType:
return GreeterType.Sddm return GreeterType.Sddm

View File

@ -18,5 +18,5 @@ class QtileProfile(XorgProfile):
@property @property
@override @override
def default_greeter_type(self) -> GreeterType | None: def default_greeter_type(self) -> GreeterType:
return GreeterType.Lightdm return GreeterType.Lightdm

View File

@ -19,5 +19,5 @@ class RiverProfile(XorgProfile):
@property @property
@override @override
def default_greeter_type(self) -> GreeterType | None: def default_greeter_type(self) -> GreeterType:
return GreeterType.Lightdm return GreeterType.Lightdm

View File

@ -1,7 +1,7 @@
from typing import TYPE_CHECKING, override from typing import TYPE_CHECKING, override
from archinstall.default_profiles.desktops import SeatAccess from archinstall.default_profiles.desktops import SeatAccess
from archinstall.default_profiles.profile import GreeterType, ProfileType, SelectResult from archinstall.default_profiles.profile import GreeterType, ProfileType
from archinstall.default_profiles.xorg import XorgProfile from archinstall.default_profiles.xorg import XorgProfile
from archinstall.tui.curses_menu import SelectMenu from archinstall.tui.curses_menu import SelectMenu
from archinstall.tui.menu_item import MenuItem, MenuItemGroup from archinstall.tui.menu_item import MenuItem, MenuItemGroup
@ -48,7 +48,7 @@ class SwayProfile(XorgProfile):
@property @property
@override @override
def default_greeter_type(self) -> GreeterType | None: def default_greeter_type(self) -> GreeterType:
return GreeterType.Lightdm return GreeterType.Lightdm
@property @property
@ -82,6 +82,6 @@ class SwayProfile(XorgProfile):
self.custom_settings['seat_access'] = result.get_value().value self.custom_settings['seat_access'] = result.get_value().value
@override @override
def do_on_select(self) -> SelectResult | None: def do_on_select(self) -> None:
self._ask_seat_access() self._ask_seat_access()
return None return None

View File

@ -18,5 +18,5 @@ class WayfireProfile(XorgProfile):
@property @property
@override @override
def default_greeter_type(self) -> GreeterType | None: def default_greeter_type(self) -> GreeterType:
return GreeterType.Lightdm return GreeterType.Lightdm

View File

@ -21,5 +21,5 @@ class Xfce4Profile(XorgProfile):
@property @property
@override @override
def default_greeter_type(self) -> GreeterType | None: def default_greeter_type(self) -> GreeterType:
return GreeterType.Lightdm return GreeterType.Lightdm

View File

@ -21,5 +21,5 @@ class XmonadProfile(XorgProfile):
@property @property
@override @override
def default_greeter_type(self) -> GreeterType | None: def default_greeter_type(self) -> GreeterType:
return GreeterType.Lightdm return GreeterType.Lightdm

View File

@ -20,7 +20,7 @@ class ServerProfile(Profile):
) )
@override @override
def do_on_select(self) -> SelectResult | None: def do_on_select(self) -> SelectResult:
items = [ items = [
MenuItem( MenuItem(
p.name, p.name,