summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAngelos Evripiotis <jevripiotis@bloomberg.net>2019-03-12 17:27:22 +0000
committerAngelos Evripiotis <jevripiotis@bloomberg.net>2019-03-12 17:27:22 +0000
commitd0ca2e6c38780f6951449fee48774c3167da11bd (patch)
tree68db75744dc6de8120aecd853d2869688c984cd2
parent0e926f2fded475d21ce5b400e4fad6b5146b40fe (diff)
downloadbuildstream-aevri/nodefaultsset.tar.gz
element.py: remove redundant `__defaults_set`aevri/nodefaultsset
Use the conventional `None` value to indicate that the class variable `__defaults` is not yet initialized. This lets us remove `__defaults_set`.
-rw-r--r--buildstream/element.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/buildstream/element.py b/buildstream/element.py
index 491d8c699..fe3b61baa 100644
--- a/buildstream/element.py
+++ b/buildstream/element.py
@@ -133,8 +133,7 @@ class Element(Plugin):
All elements derive from this class, this interface defines how
the core will be interacting with Elements.
"""
- __defaults = {} # The defaults from the yaml file and project
- __defaults_set = False # Flag, in case there are no defaults at all
+ __defaults = None # The defaults from the yaml file and project
__instantiated_elements = {} # A hash of Element by MetaElement
__redundant_source_refs = [] # A list of (source, ref) tuples which were redundantly specified
@@ -2385,7 +2384,7 @@ class Element(Plugin):
def __init_defaults(self, plugin_conf):
# Defaults are loaded once per class and then reused
#
- if not self.__defaults_set:
+ if self.__defaults is None:
defaults = {}
if plugin_conf is not None:
@@ -2413,7 +2412,6 @@ class Element(Plugin):
# Set the data class wide
type(self).__defaults = defaults
- type(self).__defaults_set = True
# This will resolve the final environment to be used when
# creating sandboxes for this element