From 984f56620fa88ff36e8a226444e149e484724bfe Mon Sep 17 00:00:00 2001
From: Sorin Sbarnea <ssbarnea@redhat.com>
Date: Thu, 29 Feb 2024 16:31:18 +0000
Subject: [PATCH] More types

---
 src/ansible_navigator/actions/images.py  |  2 +-
 src/ansible_navigator/utils/functions.py | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/ansible_navigator/actions/images.py b/src/ansible_navigator/actions/images.py
index 18f22f5ab..5aedebbe3 100644
--- a/src/ansible_navigator/actions/images.py
+++ b/src/ansible_navigator/actions/images.py
@@ -446,7 +446,7 @@ def _collect_image_list(self) -> None:
 
             try:
                 legacy_check = details["config"]["working_dir"] == "/runner"
-            except KeyError:
+            except (KeyError, TypeError):
                 legacy_check = False
 
             # podman has a root label
diff --git a/src/ansible_navigator/utils/functions.py b/src/ansible_navigator/utils/functions.py
index bfa1ec567..c5366451c 100644
--- a/src/ansible_navigator/utils/functions.py
+++ b/src/ansible_navigator/utils/functions.py
@@ -130,7 +130,7 @@ def console_width() -> int:
 
 
 # TODO: Replace this with something type-safe.
-def dispatch(obj, replacements):
+def dispatch(obj: object, replacements: tuple[tuple[str, str], ...]) -> object:
     """Make the replacement based on type.
 
     :param obj: An obj in which replacements will be made
@@ -154,7 +154,10 @@ def escape_moustaches(obj: Mapping[Any, Any]) -> Mapping[Any, Any]:
     :returns: The obj with replacements made
     """
     replacements = (("{", "U+007B"), ("}", "U+007D"))
-    return dispatch(obj, replacements)
+    result = dispatch(obj, replacements)
+    if not isinstance(result, dict):
+        raise RuntimeError
+    return result
 
 
 def environment_variable_is_file_path(
@@ -321,7 +324,7 @@ def now_iso(time_zone: str) -> str:
 PASCAL_REGEX = re.compile("((?<=[a-z0-9])[A-Z]|(?!^)[A-Z](?=[a-z]))")
 
 
-def pascal_to_snake(obj) -> list[Any] | dict[Any, Any]:
+def pascal_to_snake(obj: object) -> object:
     """Convert a pascal cased object into a snake cased object recursively.
 
     :param obj: Pascal cased object
@@ -522,11 +525,12 @@ def to_list(thing: str | list[Any] | tuple[Any] | set[Any] | None) -> list[Any]:
     return converted_value
 
 
-def unescape_moustaches(obj: Any) -> Mapping[Any, Any]:
+def unescape_moustaches(obj: Any) -> Any:
     """Unescape moustaches.
 
     :param obj: Variable that needs to contain moustaches
     :returns: The obj with replacements made
     """
     replacements = (("U+007B", "{"), ("U+007D", "}"))
-    return dispatch(obj, replacements)
+    result = dispatch(obj, replacements)
+    return result