holders: remove unholder

1 files changed, 10 insertions, 8 deletions

diff --git a/mesonbuild/modules/__init__.py b/mesonbuild/modules/__init__.py
index 69bb55239..2b53de5c6 100644
--- a/mesonbuild/modules/__init__.py
+++ b/mesonbuild/modules/__init__.py
@@ -18,13 +18,12 @@
 import os
 
 from .. import build
-from ..mesonlib import unholder, relpath
+from ..mesonlib import relpath, HoldableObject
 import typing as T
 
 if T.TYPE_CHECKING:
     from ..interpreter import Interpreter
-    from ..interpreter.interpreterobjects import IncludeDirsHolder, ExternalProgramHolder
-    from ..interpreterbase import TYPE_var, TYPE_nvar, TYPE_nkwargs
+    from ..interpreterbase import TYPE_var, TYPE_kwargs
     from ..programs import ExternalProgram
 
 class ModuleState:
@@ -61,7 +60,7 @@ class ModuleState:
         self.target_machine = interpreter.builtin['target_machine'].held_object
         self.current_node = interpreter.current_node
 
-    def get_include_args(self, include_dirs: T.Iterable[T.Union[str, 'IncludeDirsHolder']], prefix: str = '-I') -> T.List[str]:
+    def get_include_args(self, include_dirs: T.Iterable[T.Union[str, build.IncludeDirs]], prefix: str = '-I') -> T.List[str]:
         if not include_dirs:
             return []
 
@@ -69,7 +68,7 @@ class ModuleState:
         builddir = self.environment.get_build_dir()
 
         dirs_str: T.List[str] = []
-        for dirs in unholder(include_dirs):
+        for dirs in include_dirs:
             if isinstance(dirs, str):
                 dirs_str += [f'{prefix}{dirs}']
                 continue
@@ -89,14 +88,17 @@ class ModuleState:
 
     def find_program(self, prog: T.Union[str, T.List[str]], required: bool = True,
                      version_func: T.Optional[T.Callable[['ExternalProgram'], str]] = None,
-                     wanted: T.Optional[str] = None) -> 'ExternalProgramHolder':
+                     wanted: T.Optional[str] = None) -> 'ExternalProgram':
         return self._interpreter.find_program_impl(prog, required=required, version_func=version_func, wanted=wanted)
 
-class ModuleObject:
+class ModuleObject(HoldableObject):
     """Base class for all objects returned by modules
     """
     def __init__(self) -> None:
-        self.methods = {}  # type: T.Dict[str, T.Callable[[ModuleState, T.List[TYPE_nvar], TYPE_nkwargs], T.Union[ModuleReturnValue, TYPE_var]]]
+        self.methods: T.Dict[
+            str,
+            T.Callable[[ModuleState, T.List[TYPE_var], TYPE_kwargs], T.Union[ModuleReturnValue, TYPE_var]]
+        ] = {}
 
 class MutableModuleObject(ModuleObject):
     pass