Full mypy compliance and small fixes (#1777)

* Fix mypy compliance

---------

Co-authored-by: Daniel Girtler <girtler.daniel@gmail.com>

1 files changed, 13 insertions, 9 deletions

diff --git a/archinstall/lib/user_interaction/locale_conf.py b/archinstall/lib/user_interaction/locale_conf.py
index 88aec64e..cdc3423a 100644
--- a/archinstall/lib/user_interaction/locale_conf.py
+++ b/archinstall/lib/user_interaction/locale_conf.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Any, TYPE_CHECKING
+from typing import Any, TYPE_CHECKING, Optional
 
 from ..locale_helpers import list_locales
 from ..menu import Menu, MenuSelectionType
@@ -9,33 +9,37 @@ if TYPE_CHECKING:
 	_: Any
 
 
-def select_locale_lang(preset: str = None) -> str:
+def select_locale_lang(preset: Optional[str] = None) -> Optional[str]:
 	locales = list_locales()
 	locale_lang = set([locale.split()[0] for locale in locales])
 
-	selected_locale = Menu(
+	choice = Menu(
 		_('Choose which locale language to use'),
 		list(locale_lang),
 		sort=True,
 		preset_values=preset
 	).run()
 
-	match selected_locale.type_:
-		case MenuSelectionType.Selection: return selected_locale.value
+	match choice.type_:
+		case MenuSelectionType.Selection: return choice.single_value
 		case MenuSelectionType.Skip: return preset
 
+	return None
 
-def select_locale_enc(preset: str = None) -> str:
+
+def select_locale_enc(preset: Optional[str] = None) -> Optional[str]:
 	locales = list_locales()
 	locale_enc = set([locale.split()[1] for locale in locales])
 
-	selected_locale = Menu(
+	choice = Menu(
 		_('Choose which locale encoding to use'),
 		list(locale_enc),
 		sort=True,
 		preset_values=preset
 	).run()
 
-	match selected_locale.type_:
-		case MenuSelectionType.Selection: return selected_locale.value
+	match choice.type_:
+		case MenuSelectionType.Selection: return choice.single_value
 		case MenuSelectionType.Skip: return preset
+
+	return None