diff options
author | Dylan Baker <dylan@pnwbakers.com> | 2020-03-04 13:04:24 -0800 |
---|---|---|
committer | Dylan Baker <dylan@pnwbakers.com> | 2020-03-05 09:58:52 -0800 |
commit | 581d69a8d3a726dea06e8bf0cd18bb901692b56f (patch) | |
tree | a35887377e1967b4d9fb2f9280e8d3bd410e4cb1 /mesonbuild/build.py | |
parent | b231ff36df8e5cb21fa41a6380516c6cf5bf9c4e (diff) | |
download | meson-581d69a8d3a726dea06e8bf0cd18bb901692b56f.zip meson-581d69a8d3a726dea06e8bf0cd18bb901692b56f.tar.gz meson-581d69a8d3a726dea06e8bf0cd18bb901692b56f.tar.bz2 |
remove ability to pass multiple keys to extract_as_list
This makes the typing annotations basically impossible to get right, but
if we only have one key then it's easy. Fortunately python provides
comprehensions, so we don't even need the ability to pass multiple keys,
we can just [extract_as_list(kwargs, c) for c in ('a', 'b', 'c')] and
get the same result.
Diffstat (limited to 'mesonbuild/build.py')
-rw-r--r-- | mesonbuild/build.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py index 770e851..fcd1622 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -827,8 +827,7 @@ just like those detected with the dependency() function.''') self.link_whole(linktarget) c_pchlist, cpp_pchlist, clist, cpplist, cudalist, cslist, valalist, objclist, objcpplist, fortranlist, rustlist \ - = extract_as_list(kwargs, 'c_pch', 'cpp_pch', 'c_args', 'cpp_args', 'cuda_args', 'cs_args', 'vala_args', 'objc_args', - 'objcpp_args', 'fortran_args', 'rust_args') + = [extract_as_list(kwargs, c) for c in ['c_pch', 'cpp_pch', 'c_args', 'cpp_args', 'cuda_args', 'cs_args', 'vala_args', 'objc_args', 'objcpp_args', 'fortran_args', 'rust_args']] self.add_pch('c', c_pchlist) self.add_pch('cpp', cpp_pchlist) @@ -2161,7 +2160,7 @@ class CustomTarget(Target): self.build_always_stale = kwargs['build_always_stale'] if not isinstance(self.build_always_stale, bool): raise InvalidArguments('Argument build_always_stale must be a boolean.') - extra_deps, depend_files = extract_as_list(kwargs, 'depends', 'depend_files', pop = False) + extra_deps, depend_files = [extract_as_list(kwargs, c, pop=False) for c in ['depends', 'depend_files']] for ed in extra_deps: while hasattr(ed, 'held_object'): ed = ed.held_object |