diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2021-08-27 11:47:12 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2021-08-27 14:54:29 -0700 |
| commit | 11fbaf29d8444ca35269a938e46327dfbe7820bd (patch) | |
| tree | 135656b3fb49b4d185655f43fe1de62580788fee /mesonbuild/interpreter/interpreterobjects.py | |
| parent | 3f5d80b8bbd40d166657c1c7f856fe7777623df1 (diff) | |
| download | meson-11fbaf29d8444ca35269a938e46327dfbe7820bd.zip meson-11fbaf29d8444ca35269a938e46327dfbe7820bd.tar.gz meson-11fbaf29d8444ca35269a938e46327dfbe7820bd.tar.bz2 | |
interpreter: fix cases of `KwargInfo(..., T, default=None)`
The correct way to mark these is `KwargInfo(..., (T, type(None)))`.
There's also a few cases of `(T, None)` which is invalid, as `None`
isn't a type
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, |