options: fix types for initialize_from_subproject_call

No code changes, just making mypy annotations truthful.

Signed-off-by: Paolo Bonzini <[email protected]>
(cherry picked from commit d55364f)

Author: bonzini

mesonbuild/options.py

@@ -1400,21 +1400,19 @@ def validate_cmd_line_options(self, cmd_line_options: OptionStringLikeDict) -> N
             keys = ', '.join(unknown_options)
             raise MesonException(f'Unknown options: {keys}')
 
-    def hacky_mchackface_back_to_list(self, optdict: T.Dict[str, str]) -> T.List[str]:
+    def hacky_mchackface_back_to_list(self, optdict: T.Union[T.List[str], OptionStringLikeDict]) -> T.List[str]:
         if isinstance(optdict, dict):
             return [f'{k}={v}' for k, v in optdict.items()]
         return optdict
 
     def initialize_from_subproject_call(self,
                                         subproject: str,
-                                        spcall_default_options: T.Union[T.List[str], OptionStringLikeDict],
-                                        project_default_options: T.Union[T.List[str], OptionStringLikeDict],
-                                        cmd_line_options: T.Union[T.List[str], OptionStringLikeDict]) -> None:
+                                        spcall_default_options_in: T.Union[T.List[str], OptionStringLikeDict],
+                                        project_default_options_in: T.Union[T.List[str], OptionStringLikeDict],
+                                        cmd_line_options: OptionStringLikeDict) -> None:
         is_first_invocation = True
-        spcall_default_options = self.hacky_mchackface_back_to_list(spcall_default_options) # type: ignore [arg-type]
-        project_default_options = self.hacky_mchackface_back_to_list(project_default_options) # type: ignore [arg-type]
-        if isinstance(spcall_default_options, str):
-            spcall_default_options = [spcall_default_options]
+        spcall_default_options = self.hacky_mchackface_back_to_list(spcall_default_options_in)
+        project_default_options = self.hacky_mchackface_back_to_list(project_default_options_in)
         for o in itertools.chain(project_default_options, spcall_default_options):
             keystr, valstr = o.split('=', 1)
             key = OptionKey.from_string(keystr)
@@ -1432,7 +1430,6 @@ def initialize_from_subproject_call(self,
                 aug_str = str(key)
                 self.augments[aug_str] = valstr
         # Check for pending options
-        assert isinstance(cmd_line_options, dict)
         for key, valstr in cmd_line_options.items(): # type: ignore [assignment]
             if not isinstance(key, OptionKey):
                 key = OptionKey.from_string(key)