buildstream/_context.py

@@ -361,14 +361,17 @@ class Context():
     #    (bool): Whether or not to use strict build plan
     #
     def get_strict(self):
+        if self._strict_build_plan is None:
+            # Either we're not overridden or we've never worked it out before
+            # so work out if we should be strict, and then cache the result
+            toplevel = self.get_toplevel_project()
+            overrides = self.get_overrides(toplevel.name)
+            self._strict_build_plan = _yaml.node_get(overrides, bool, 'strict', default_value=True)
 
         # If it was set by the CLI, it overrides any config
-        if self._strict_build_plan is not None:
-            return self._strict_build_plan
-
-        toplevel = self.get_toplevel_project()
-        overrides = self.get_overrides(toplevel.name)
-        return _yaml.node_get(overrides, bool, 'strict', default_value=True)
+        # Ditto if we've already computed this, then we return the computed
+        # value which we cache here too.
+        return self._strict_build_plan
 
     # get_cache_key():
     #

buildstream/_yaml.py

@@ -1109,6 +1109,10 @@ __LIST_TYPES = (list, yaml.comments.CommentedSeq)
 # copying tactic.
 __PROVENANCE_TYPES = (Provenance, DictProvenance, MemberProvenance, ElementProvenance)
 
+# These are the directives used to compose lists, we need this because it's
+# slightly faster during the node_final_assertions checks
+__NODE_ASSERT_COMPOSITION_DIRECTIVES = ('(>)', '(<)', '(=)')
+
 
 def node_chain_copy(source):
     copy = ChainMap({}, source)
@@ -1202,22 +1206,26 @@ def node_final_assertions(node):
         # indicates that the user intended to override a list which
         # never existed in the underlying data
         #
-        if key in ['(>)', '(<)', '(=)']:
+        if key in __NODE_ASSERT_COMPOSITION_DIRECTIVES:
             provenance = node_get_provenance(node, key)
             raise LoadError(LoadErrorReason.TRAILING_LIST_DIRECTIVE,
                             "{}: Attempt to override non-existing list".format(provenance))
 
-        if isinstance(value, collections.abc.Mapping):
+        value_type = type(value)
+
+        if value_type in __DICT_TYPES:
             node_final_assertions(value)
-        elif isinstance(value, list):
+        elif value_type in __LIST_TYPES:
             list_final_assertions(value)
 
 
 def list_final_assertions(values):
     for value in values:
-        if isinstance(value, collections.abc.Mapping):
+        value_type = type(value)
+
+        if value_type in __DICT_TYPES:
             node_final_assertions(value)
-        elif isinstance(value, list):
+        elif value_type in __LIST_TYPES:
             list_final_assertions(value)