Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

interpreterobjects: use typed_* with configuration_data.merge_from

This commit is contained in:
Dylan Baker 2021-12-06 15:02:18 -08:00 committed by Eli Schwartz
parent f7cbe89a13
commit 7641bfd0ce
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mesonbuild/interpreter/interpreterobjects.py
View File

@ -393,15 +393,13 @@ class ConfigurationDataObject(MutableInterpreterObject, MesonInterpreterObject):
def keys(self) -> T.List[str]:
return list(self.conf_data.values.keys())
@typed_pos_args('configuration_data.merge_from', object) # yay for recursive type validation!
@noKwargs
def merge_from_method(self, args: T.List[TYPE_var], kwargs: TYPE_kwargs) -> None:
if len(args) != 1:
raise InterpreterException('Merge_from takes one positional argument.')
from_object_holder = args[0]
if not isinstance(from_object_holder, ConfigurationDataObject):
from_object = args[0]
if not isinstance(from_object, ConfigurationDataObject):
raise InterpreterException('Merge_from argument must be a configuration data object.')
from_object = from_object_holder.conf_data
for k, v in from_object.values.items():
self.conf_data.values[k] = v
self.conf_data.values.update(from_object.conf_data.values)
_PARTIAL_DEP_KWARGS = [