summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Schubert <ben.c.schubert@gmail.com>2019-07-12 10:05:45 +0100
committerDaniel Silverstone <daniel.silverstone@codethink.co.uk>2019-07-15 07:40:32 +0000
commit6a6ef4e765f1c34a12b21720f806d443f15ceda5 (patch)
treed7064f74c0b13b1e9a928658ff38e69c9aa17942
parent38e705e48d8f103059cc8b0783452f59675f28d9 (diff)
downloadbuildstream-6a6ef4e765f1c34a12b21720f806d443f15ceda5.tar.gz
node: Mark `MappingNode._get` as private
-rw-r--r--src/buildstream/node.pxd2
-rw-r--r--src/buildstream/node.pyx34
2 files changed, 18 insertions, 18 deletions
diff --git a/src/buildstream/node.pxd b/src/buildstream/node.pxd
index 3069b2fc9..19f0a223e 100644
--- a/src/buildstream/node.pxd
+++ b/src/buildstream/node.pxd
@@ -66,10 +66,10 @@ cdef class MappingNode(Node):
# Protected Methods
cdef void _compose_on_composite_dict(self, MappingNode target)
cdef void _compose_on_list(self, SequenceNode target)
- cdef Node _get(self, str key, default, default_constructor)
# Private Methods
cdef void __composite(self, MappingNode target, list path=*) except *
+ cdef Node _get(self, str key, default, default_constructor)
cdef class ScalarNode(Node):
diff --git a/src/buildstream/node.pyx b/src/buildstream/node.pyx
index d20ff664f..48339bafd 100644
--- a/src/buildstream/node.pyx
+++ b/src/buildstream/node.pyx
@@ -570,23 +570,6 @@ cdef class MappingNode(Node):
else:
target.value["(>)"] = suffix
- cdef Node _get(self, str key, object default, object default_constructor):
- value = self.value.get(key, _sentinel)
-
- if value is _sentinel:
- if default is _sentinel:
- provenance = self.get_provenance()
- raise LoadError(LoadErrorReason.INVALID_DATA,
- "{}: Dictionary did not contain expected key '{}'".format(provenance, key))
-
- if default is None:
- value = None
- else:
- value = default_constructor.__new__(
- default_constructor, _SYNTHETIC_FILE_INDEX, 0, next_synthetic_counter(), default)
-
- return value
-
cdef bint _is_composite_list(self) except *:
cdef bint has_directives = False
cdef bint has_keys = False
@@ -634,6 +617,23 @@ cdef class MappingNode(Node):
value._compose_on(key, target, path)
path.pop()
+ cdef Node _get(self, str key, object default, object default_constructor):
+ value = self.value.get(key, _sentinel)
+
+ if value is _sentinel:
+ if default is _sentinel:
+ provenance = self.get_provenance()
+ raise LoadError(LoadErrorReason.INVALID_DATA,
+ "{}: Dictionary did not contain expected key '{}'".format(provenance, key))
+
+ if default is None:
+ value = None
+ else:
+ value = default_constructor.__new__(
+ default_constructor, _SYNTHETIC_FILE_INDEX, 0, next_synthetic_counter(), default)
+
+ return value
+
cdef class SequenceNode(Node):
def __cinit__(self, int file_index, int line, int column, list value):