_yaml: Remove 'node_items' and add 'MappingNode.items()'bschubert/node-api-keys

One difference is that 'MappingNode.items()' does not strip the
provenance from scalars and lists, which ends up not affecting the
code much.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/buildstream/_options/optionpool.py b/src/buildstream/_options/optionpool.py
index af0f99b97..96cff898d 100644
--- a/src/buildstream/_options/optionpool.py
+++ b/src/buildstream/_options/optionpool.py
@@ -65,7 +65,7 @@ class OptionPool():
     #
     def load(self, options):
 
-        for option_name, option_definition in _yaml.node_items(options):
+        for option_name, option_definition in options.items():
 
             # Assert that the option name is a valid symbol
             p = _yaml.node_get_provenance(options, option_name)
@@ -272,7 +272,7 @@ class OptionPool():
             del node['(?)']
 
             for condition, p in zip(conditions, provenance):
-                tuples = list(_yaml.node_items(condition))
+                tuples = list(condition.items())
                 if len(tuples) > 1:
                     raise LoadError(LoadErrorReason.INVALID_DATA,
                                     "{}: Conditional statement has more than one key".format(p))
@@ -284,7 +284,7 @@ class OptionPool():
                     # Prepend the provenance of the error
                     raise LoadError(e.reason, "{}: {}".format(p, e)) from e
 
-                if not _yaml.is_node(value):
+                if type(value) is not _yaml.MappingNode:  # pylint: disable=unidiomatic-typecheck
                     raise LoadError(LoadErrorReason.ILLEGAL_COMPOSITE,
                                     "{}: Only values of type 'dict' can be composed.".format(p))