diff options
author | Dylan Baker <dylan@pnwbakers.com> | 2021-08-28 11:58:03 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-28 11:58:03 -0700 |
commit | f407ad5d28f24755a19bb95495141db0ad9fe740 (patch) | |
tree | 73f7eed2e85181d82058bfd19a2689756577c13e /mesonbuild/interpreter/interpreterobjects.py | |
parent | 64ea8dce7a26f06046c98bc7b3e30f06bf8ca98f (diff) | |
parent | b4bc8464e69c353fc0792054ab4209d4e8b5a096 (diff) | |
download | meson-f407ad5d28f24755a19bb95495141db0ad9fe740.zip meson-f407ad5d28f24755a19bb95495141db0ad9fe740.tar.gz meson-f407ad5d28f24755a19bb95495141db0ad9fe740.tar.bz2 |
Merge pull request #9183 from dcbaker/submit/validate-default
Validate default values for KwargInfo
Diffstat (limited to 'mesonbuild/interpreter/interpreterobjects.py')
-rw-r--r-- | mesonbuild/interpreter/interpreterobjects.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/interpreter/interpreterobjects.py b/mesonbuild/interpreter/interpreterobjects.py index 2bff1bb..d524059 100644 --- a/mesonbuild/interpreter/interpreterobjects.py +++ b/mesonbuild/interpreter/interpreterobjects.py @@ -20,6 +20,7 @@ from ..interpreterbase import ( typed_pos_args, typed_kwargs, stringArgs, permittedKwargs, noArgsFlattening, noPosargs, noKwargs, permissive_unholder_return, TYPE_var, TYPE_kwargs, TYPE_nvar, TYPE_nkwargs, flatten, resolve_second_level_holders, InterpreterException, InvalidArguments, InvalidCode) +from ..interpreter.type_checking import NoneType from ..dependencies import Dependency, ExternalLibrary, InternalDependency from ..programs import ExternalProgram from ..mesonlib import HoldableObject, MesonException, OptionKey, listify, Popen_safe @@ -975,7 +976,7 @@ class GeneratorHolder(ObjectHolder[build.Generator]): @typed_pos_args('generator.process', min_varargs=1, varargs=(str, mesonlib.File, build.CustomTarget, build.CustomTargetIndex, build.GeneratedList)) @typed_kwargs( 'generator.process', - KwargInfo('preserve_path_from', str, since='0.45.0'), + KwargInfo('preserve_path_from', (str, NoneType), since='0.45.0'), KwargInfo('extra_args', ContainerTypeInfo(list, str), listify=True, default=[]), ) def process_method(self, |