diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2022-02-28 16:04:30 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2022-03-03 10:30:31 -0800 |
| commit | 643b3f227edfbac590fa37c248f14d7172ee1066 (patch) | |
| tree | d360ae18d5e0cde3e0560b88dced30f17045a63f /mesonbuild/interpreter | |
| parent | a760ef5b60e885c0655645970c211639e8c75757 (diff) | |
| download | meson-643b3f227edfbac590fa37c248f14d7172ee1066.zip meson-643b3f227edfbac590fa37c248f14d7172ee1066.tar.gz meson-643b3f227edfbac590fa37c248f14d7172ee1066.tar.bz2 | |
interpreter: fix mismatched type expectations
Diffstat (limited to 'mesonbuild/interpreter')
| -rw-r--r-- | mesonbuild/interpreter/interpreter.py | 2 | ||||
| -rw-r--r-- | mesonbuild/interpreter/interpreterobjects.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index ee125bc..7c4f381 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -816,7 +816,7 @@ external dependencies (including libraries) must go to "dependencies".''') return self.do_subproject(args[0], 'meson', kw) def disabled_subproject(self, subp_name: str, disabled_feature: T.Optional[str] = None, - exception: T.Optional[mesonlib.MesonException] = None) -> SubprojectHolder: + exception: T.Optional[Exception] = None) -> SubprojectHolder: sub = SubprojectHolder(NullSubprojectInterpreter(), os.path.join(self.subproject_dir, subp_name), disabled_feature=disabled_feature, exception=exception) self.subprojects[subp_name] = sub diff --git a/mesonbuild/interpreter/interpreterobjects.py b/mesonbuild/interpreter/interpreterobjects.py index eed750e..a3c0bef 100644 --- a/mesonbuild/interpreter/interpreterobjects.py +++ b/mesonbuild/interpreter/interpreterobjects.py @@ -24,7 +24,7 @@ from ..interpreterbase import ( from ..interpreter.type_checking import NoneType, ENV_SEPARATOR_KW from ..dependencies import Dependency, ExternalLibrary, InternalDependency from ..programs import ExternalProgram -from ..mesonlib import HoldableObject, MesonException, OptionKey, listify, Popen_safe +from ..mesonlib import HoldableObject, OptionKey, listify, Popen_safe import typing as T @@ -673,7 +673,7 @@ class SubprojectHolder(MesonInterpreterObject): subdir: str, warnings: int = 0, disabled_feature: T.Optional[str] = None, - exception: T.Optional[MesonException] = None) -> None: + exception: T.Optional[Exception] = None) -> None: super().__init__() self.held_object = subinterpreter self.warnings = warnings |