diff options
-rw-r--r-- | src/buildstream/_context.py | 2 | ||||
-rw-r--r-- | src/buildstream/_includes.py | 2 | ||||
-rw-r--r-- | src/buildstream/_options/optionpool.py | 2 | ||||
-rw-r--r-- | src/buildstream/_project.py | 6 | ||||
-rw-r--r-- | src/buildstream/_yaml.pxd | 8 | ||||
-rw-r--r-- | src/buildstream/_yaml.pyx | 26 | ||||
-rw-r--r-- | src/buildstream/element.py | 20 | ||||
-rw-r--r-- | src/buildstream/source.py | 2 | ||||
-rw-r--r-- | src/buildstream/testing/runcli.py | 2 | ||||
-rw-r--r-- | tests/internals/yaml.py | 14 |
10 files changed, 42 insertions, 42 deletions
diff --git a/src/buildstream/_context.py b/src/buildstream/_context.py index 2243192b3..37af45ca9 100644 --- a/src/buildstream/_context.py +++ b/src/buildstream/_context.py @@ -192,7 +192,7 @@ class Context(): if config: self.config_origin = os.path.abspath(config) user_config = _yaml.load(config) - user_config.composite(defaults) + user_config._composite(defaults) # Give obsoletion warnings if 'builddir' in defaults: diff --git a/src/buildstream/_includes.py b/src/buildstream/_includes.py index 678f24dba..90dd8d929 100644 --- a/src/buildstream/_includes.py +++ b/src/buildstream/_includes.py @@ -82,7 +82,7 @@ class Includes: finally: included.remove(file_path) - include_node.composite_under(node) + include_node._composite_under(node) for value in node.values(): self._process_value(value, diff --git a/src/buildstream/_options/optionpool.py b/src/buildstream/_options/optionpool.py index 3b33c0349..38e9e6769 100644 --- a/src/buildstream/_options/optionpool.py +++ b/src/buildstream/_options/optionpool.py @@ -285,7 +285,7 @@ class OptionPool(): # Apply the yaml fragment if its condition evaluates to true if apply_fragment: - value.composite(node) + value._composite(node) return True diff --git a/src/buildstream/_project.py b/src/buildstream/_project.py index f075aeb51..85ce11e62 100644 --- a/src/buildstream/_project.py +++ b/src/buildstream/_project.py @@ -575,7 +575,7 @@ class Project(): raise pre_config_node = self._default_config_node.copy() - self._project_conf.composite(pre_config_node) + self._project_conf._composite(pre_config_node) # Assert project's format version early, before validating toplevel keys format_version = pre_config_node.get_int('format-version') @@ -621,7 +621,7 @@ class Project(): project_conf_first_pass = self._project_conf.copy() self._project_includes.process(project_conf_first_pass, only_local=True) config_no_include = self._default_config_node.copy() - project_conf_first_pass.composite(config_no_include) + project_conf_first_pass._composite(config_no_include) self._load_pass(config_no_include, self.first_pass_config, ignore_unknown=True) @@ -646,7 +646,7 @@ class Project(): project_conf_second_pass = self._project_conf.copy() self._project_includes.process(project_conf_second_pass) config = self._default_config_node.copy() - project_conf_second_pass.composite(config) + project_conf_second_pass._composite(config) self._load_pass(config, self.config) diff --git a/src/buildstream/_yaml.pxd b/src/buildstream/_yaml.pxd index 47bd38946..7aac91569 100644 --- a/src/buildstream/_yaml.pxd +++ b/src/buildstream/_yaml.pxd @@ -40,9 +40,9 @@ cdef class Node: cdef class MappingNode(Node): cdef dict value - cpdef void composite(self, MappingNode target) except * - cpdef void composite_under(self, MappingNode target) except * - cdef Node get(self, str key, default, default_constructor) + cpdef void _composite(self, MappingNode target) except * + cpdef void _composite_under(self, MappingNode target) except * + cdef Node _get(self, str key, default, default_constructor) cpdef MappingNode get_mapping(self, str key, default=*) cpdef Node get_node(self, str key, list allowed_types=*, bint allow_none=*) cpdef ScalarNode get_scalar(self, str key, default=*) @@ -56,7 +56,7 @@ cdef class MappingNode(Node): cpdef void validate_keys(self, list valid_keys) except * cpdef object values(self) - cdef void _composite(self, MappingNode target, list path=*) except * + cdef void __composite(self, MappingNode target, list path=*) except * cdef void _compose_on_composite_dict(self, MappingNode target) cdef void _compose_on_list(self, SequenceNode target) cpdef list _find(self, Node target) diff --git a/src/buildstream/_yaml.pyx b/src/buildstream/_yaml.pyx index e2593d95e..0f9fca519 100644 --- a/src/buildstream/_yaml.pyx +++ b/src/buildstream/_yaml.pyx @@ -232,7 +232,7 @@ cdef class MappingNode(Node): return MappingNode.__new__(MappingNode, self.file_index, self.line, self.column, copy) - # find() + # _find() # # Searches the given node tree for the given target node. # @@ -250,7 +250,7 @@ cdef class MappingNode(Node): return path return None - # composite() + # _composite() # # Compose one mapping node onto another # @@ -259,9 +259,9 @@ cdef class MappingNode(Node): # # Raises: LoadError # - cpdef void composite(self, MappingNode target) except *: + cpdef void _composite(self, MappingNode target) except *: try: - self._composite(target, []) + self.__composite(target, []) except CompositeError as e: source_provenance = self.get_provenance() error_prefix = "" @@ -273,10 +273,10 @@ cdef class MappingNode(Node): e.path, e.message)) from e - # Like composite(target, source), but where target overrides source instead. + # Like _composite(target, source), but where target overrides source instead. # - cpdef void composite_under(self, MappingNode target) except *: - target.composite(self) + cpdef void _composite_under(self, MappingNode target) except *: + target._composite(self) cdef str key cdef Node value @@ -287,7 +287,7 @@ cdef class MappingNode(Node): for key in to_delete: del target.value[key] - cdef Node get(self, str key, object default, object default_constructor): + cdef Node _get(self, str key, object default, object default_constructor): value = self.value.get(key, _sentinel) if value is _sentinel: @@ -305,7 +305,7 @@ cdef class MappingNode(Node): return value cpdef MappingNode get_mapping(self, str key, object default=_sentinel): - value = self.get(key, default, MappingNode) + value = self._get(key, default, MappingNode) if type(value) is not MappingNode and value is not None: provenance = value.get_provenance() @@ -335,7 +335,7 @@ cdef class MappingNode(Node): return value cpdef ScalarNode get_scalar(self, str key, object default=_sentinel): - value = self.get(key, default, ScalarNode) + value = self._get(key, default, ScalarNode) if type(value) is not ScalarNode: if value is None: @@ -349,7 +349,7 @@ cdef class MappingNode(Node): return value cpdef SequenceNode get_sequence(self, str key, object default=_sentinel): - value = self.get(key, default, SequenceNode) + value = self._get(key, default, SequenceNode) if type(value) is not SequenceNode and value is not None: provenance = value.get_provenance() @@ -416,7 +416,7 @@ cdef class MappingNode(Node): return {key: value.strip_node_info() for key, value in self.value.items()} - cdef void _composite(self, MappingNode target, list path=None) except *: + cdef void __composite(self, MappingNode target, list path=None) except *: cdef str key cdef Node value @@ -454,7 +454,7 @@ cdef class MappingNode(Node): # the same provenance as the incoming dict target.value[key] = MappingNode.__new__(MappingNode, self.file_index, self.line, self.column, {}) - self._composite(target.value[key], path) + self.__composite(target.value[key], path) cdef void _compose_on_list(self, SequenceNode target): cdef SequenceNode clobber = self.value.get("(=)") diff --git a/src/buildstream/element.py b/src/buildstream/element.py index 0cd3fcbe1..c2c848fc1 100644 --- a/src/buildstream/element.py +++ b/src/buildstream/element.py @@ -2499,7 +2499,7 @@ class Element(Plugin): splits = project._splits.copy() # Extend project wide split rules with any split rules defined by the element - element_splits.composite(splits) + element_splits._composite(splits) element_bst['split-rules'] = splits element_public['bst'] = element_bst @@ -2532,7 +2532,7 @@ class Element(Plugin): overrides = elements.get_mapping(kind, default=None) if overrides: - overrides.composite(defaults) + overrides._composite(defaults) # Set the data class wide cls.__defaults = defaults @@ -2549,8 +2549,8 @@ class Element(Plugin): else: environment = project.base_environment.copy() - default_env.composite(environment) - meta.environment.composite(environment) + default_env._composite(environment) + meta.environment._composite(environment) environment._assert_fully_composited() return environment @@ -2595,8 +2595,8 @@ class Element(Plugin): else: variables = project.base_variables.copy() - default_vars.composite(variables) - meta.variables.composite(variables) + default_vars._composite(variables) + meta.variables._composite(variables) variables._assert_fully_composited() for var in ('project-name', 'element-name', 'max-jobs'): @@ -2623,7 +2623,7 @@ class Element(Plugin): config = cls.__defaults.get_mapping('config', default={}) config = config.copy() - meta.config.composite(config) + meta.config._composite(config) config._assert_fully_composited() return config @@ -2649,8 +2649,8 @@ class Element(Plugin): sandbox_defaults = cls.__defaults.get_mapping('sandbox', default={}) sandbox_defaults = sandbox_defaults.copy() - sandbox_defaults.composite(sandbox_config) - meta.sandbox.composite(sandbox_config) + sandbox_defaults._composite(sandbox_config) + meta.sandbox._composite(sandbox_config) sandbox_config._assert_fully_composited() # Sandbox config, unlike others, has fixed members so we should validate them @@ -2685,7 +2685,7 @@ class Element(Plugin): # Allow elements to extend the default splits defined in their project or # element specific defaults - element_splits.composite(base_splits) + element_splits._composite(base_splits) element_bst['split-rules'] = base_splits element_public['bst'] = element_bst diff --git a/src/buildstream/source.py b/src/buildstream/source.py index f63142b3c..3b47b55ea 100644 --- a/src/buildstream/source.py +++ b/src/buildstream/source.py @@ -1284,7 +1284,7 @@ class Source(Plugin): config = cls.__defaults.get_mapping('config', default={}) config = config.copy() - meta.config.composite(config) + meta.config._composite(config) config._assert_fully_composited() return config diff --git a/src/buildstream/testing/runcli.py b/src/buildstream/testing/runcli.py index 7d4039747..95bf83eff 100644 --- a/src/buildstream/testing/runcli.py +++ b/src/buildstream/testing/runcli.py @@ -573,7 +573,7 @@ class CliIntegration(Cli): project_config = _yaml.load(temp_project) - project_config.composite(base_config) + project_config._composite(base_config) _yaml.roundtrip_dump(base_config, project_filename) diff --git a/tests/internals/yaml.py b/tests/internals/yaml.py index 659b9a917..f2e1c70ef 100644 --- a/tests/internals/yaml.py +++ b/tests/internals/yaml.py @@ -183,7 +183,7 @@ def test_composite_preserve_originals(datafiles): base = _yaml.load(filename) overlay = _yaml.load(overlayfile) base_copy = base.copy() - overlay.composite(base_copy) + overlay._composite(base_copy) copy_extra = base_copy.get_mapping('extra') orig_extra = base.get_mapping('extra') @@ -249,7 +249,7 @@ def test_list_composition(datafiles, filename, tmpdir, base = _yaml.load(base_file, 'basics.yaml') overlay = _yaml.load(overlay_file, shortname=filename) - overlay.composite(base) + overlay._composite(base) children = base.get_sequence('children') assert len(children) == length @@ -267,7 +267,7 @@ def test_list_deletion(datafiles): base = _yaml.load(base, shortname='basics.yaml') overlay = _yaml.load(overlay, shortname='listoverwriteempty.yaml') - overlay.composite(base) + overlay._composite(base) children = base.get_sequence('children') assert not children @@ -370,8 +370,8 @@ def test_list_composition_twice(datafiles, tmpdir, filename1, filename2, overlay1 = _yaml.load(file1, shortname=filename1) overlay2 = _yaml.load(file2, shortname=filename2) - overlay1.composite(base) - overlay2.composite(base) + overlay1._composite(base) + overlay2._composite(base) children = base.get_sequence('children') assert len(children) == length @@ -387,8 +387,8 @@ def test_list_composition_twice(datafiles, tmpdir, filename1, filename2, overlay1 = _yaml.load(file1, shortname=filename1) overlay2 = _yaml.load(file2, shortname=filename2) - overlay2.composite(overlay1) - overlay1.composite(base) + overlay2._composite(overlay1) + overlay1._composite(base) children = base.get_sequence('children') assert len(children) == length |