From fcef3658433f74a2f396ed353bb3534f0001f3d8 Mon Sep 17 00:00:00 2001 From: Benjamin Schubert Date: Sun, 9 Jun 2019 14:22:35 +0100 Subject: _yaml: add 'get_mapping()' to MappingNode This allows to get a mapping node from another 'MappingNode', replacing 'node_get(my_mapping, key, type=dict)' Also changes all places where 'node_get' was called like that by the new API. --- src/buildstream/_loader/loader.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/buildstream/_loader') diff --git a/src/buildstream/_loader/loader.py b/src/buildstream/_loader/loader.py index b221c48d0..e5730d416 100644 --- a/src/buildstream/_loader/loader.py +++ b/src/buildstream/_loader/loader.py @@ -487,12 +487,12 @@ class Loader(): meta_element = MetaElement(self.project, element.name, element_kind, elt_provenance, meta_sources, - _yaml.node_get(node, dict, Symbol.CONFIG, default_value={}), - _yaml.node_get(node, dict, Symbol.VARIABLES, default_value={}), - _yaml.node_get(node, dict, Symbol.ENVIRONMENT, default_value={}), + node.get_mapping(Symbol.CONFIG, default={}), + node.get_mapping(Symbol.VARIABLES, default={}), + node.get_mapping(Symbol.ENVIRONMENT, default={}), _yaml.node_get(node, list, Symbol.ENV_NOCACHE, default_value=[]), - _yaml.node_get(node, dict, Symbol.PUBLIC, default_value={}), - _yaml.node_get(node, dict, Symbol.SANDBOX, default_value={}), + node.get_mapping(Symbol.PUBLIC, default={}), + node.get_mapping(Symbol.SANDBOX, default={}), element_kind == 'junction') # Cache it now, make sure it's already there before recursing -- cgit v1.2.1