diff options
| author | Benjamin Schubert <ben.c.schubert@gmail.com> | 2019-07-03 18:01:30 +0100 |
|---|---|---|
| committer | bst-marge-bot <marge-bot@buildstream.build> | 2019-07-15 14:14:03 +0000 |
| commit | 8c9f41922ad16f8a031ac612bb35e493e8581380 (patch) | |
| tree | cebc4afe2d0238033362905a99400d4d2824d7dc /src/buildstream/_options | |
| parent | d8466183f77c75bbd7ad27c7cbf5e58189945be1 (diff) | |
| download | buildstream-8c9f41922ad16f8a031ac612bb35e493e8581380.tar.gz | |
_yaml: Remove 'node_validate' and replace by 'MappingNode.validate_keys'
- adapt all call sites to use the new API
Diffstat (limited to 'src/buildstream/_options')
| -rw-r--r-- | src/buildstream/_options/optionbool.py | 3 | ||||
| -rw-r--r-- | src/buildstream/_options/optionenum.py | 2 | ||||
| -rw-r--r-- | src/buildstream/_options/optionflags.py | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/buildstream/_options/optionbool.py b/src/buildstream/_options/optionbool.py index 1e5935e48..28ab71278 100644 --- a/src/buildstream/_options/optionbool.py +++ b/src/buildstream/_options/optionbool.py @@ -17,7 +17,6 @@ # Authors: # Tristan Van Berkom <tristan.vanberkom@codethink.co.uk> -from .. import _yaml from .._exceptions import LoadError, LoadErrorReason from .option import Option, OPTION_SYMBOLS @@ -33,7 +32,7 @@ class OptionBool(Option): def load(self, node): super().load(node) - _yaml.node_validate(node, OPTION_SYMBOLS + ['default']) + node.validate_keys(OPTION_SYMBOLS + ['default']) self.value = node.get_bool('default') def load_value(self, node, *, transform=None): diff --git a/src/buildstream/_options/optionenum.py b/src/buildstream/_options/optionenum.py index f04cecd8b..477fe1ed9 100644 --- a/src/buildstream/_options/optionenum.py +++ b/src/buildstream/_options/optionenum.py @@ -44,7 +44,7 @@ class OptionEnum(Option): if allow_default_definition: valid_symbols += ['default'] - _yaml.node_validate(node, valid_symbols) + node.validate_keys(valid_symbols) self.values = node.get_sequence('values', default=[]).as_str_list() if not self.values: diff --git a/src/buildstream/_options/optionflags.py b/src/buildstream/_options/optionflags.py index c9758e403..1d86361d8 100644 --- a/src/buildstream/_options/optionflags.py +++ b/src/buildstream/_options/optionflags.py @@ -44,7 +44,7 @@ class OptionFlags(Option): if allow_value_definitions: valid_symbols += ['values'] - _yaml.node_validate(node, valid_symbols) + node.validate_keys(valid_symbols) # Allow subclass to define the valid values self.values = self.load_valid_values(node) |