diff options
| author | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2017-11-13 12:06:06 +0000 |
|---|---|---|
| committer | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2017-11-14 13:03:49 +0000 |
| commit | e46be24abfbb3ed00d2bdad67ba86749f3b0f03d (patch) | |
| tree | 44a209f8eb4ec942b877c078068297eca84db1e5 | |
| parent | 927fd1b8aa5c292109c25c3ed1113078939ce961 (diff) | |
| download | buildstream-e46be24abfbb3ed00d2bdad67ba86749f3b0f03d.tar.gz | |
Make node_get_member pass default values as positional args
It is functionally similar to dict.get() and fulfills the same role, so
it should be used that way.
| -rw-r--r-- | buildstream/buildelement.py | 4 | ||||
| -rw-r--r-- | buildstream/element.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/buildstream/buildelement.py b/buildstream/buildelement.py index 824d21fd0..a794e9844 100644 --- a/buildstream/buildelement.py +++ b/buildstream/buildelement.py @@ -137,7 +137,7 @@ class BuildElement(Element): # which is normally automatically resolved and does not effect # the cache key. variables = self._get_variables() - if self.node_get_member(variables.variables, bool, 'notparallel', default_value=False): + if self.node_get_member(variables.variables, bool, 'notparallel', False): dictionary['notparallel'] = True return dictionary @@ -214,7 +214,7 @@ class BuildElement(Element): return self.get_variable('install-root') def _get_commands(self, node, name): - list_node = self.node_get_member(node, list, name, default_value=[]) + list_node = self.node_get_member(node, list, name, []) commands = [] for i in range(len(list_node)): diff --git a/buildstream/element.py b/buildstream/element.py index c94ba0a31..835bd0df8 100644 --- a/buildstream/element.py +++ b/buildstream/element.py @@ -278,7 +278,7 @@ class Element(Plugin): # variables in the returned string name = self.node_subst_member(node, 'name') """ - value = self.node_get_member(node, str, member_name, default_value=default_value) + value = self.node_get_member(node, str, member_name, default_value) return self.__variables.subst(value) def node_subst_list(self, node, member_name): @@ -457,7 +457,7 @@ class Element(Plugin): environment = self.get_environment() if bstdata is not None: - commands = self.node_get_member(bstdata, list, 'integration-commands', default_value=[]) + commands = self.node_get_member(bstdata, list, 'integration-commands', []) for i in range(len(commands)): cmd = self.node_subst_list_element(bstdata, 'integration-commands', [i]) self.status("Running integration command", detail=cmd) |