summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Silverstone <daniel.silverstone@codethink.co.uk>2019-05-30 10:37:00 +0100
committerDaniel Silverstone <daniel.silverstone@codethink.co.uk>2019-05-30 10:47:17 +0100
commit794503b07d16e306d982fcf1640df343b2a6b23c (patch)
tree8539a2d397dbe6afb4c5be13c474d5a523c40d59
parent8b302c55d2da4f7ab29e346496a8e2fe3d7a7660 (diff)
downloadbuildstream-794503b07d16e306d982fcf1640df343b2a6b23c.tar.gz
loader.py: Make _check_circular_deps() static
This did not need to be an instance method, making it static might improve performance and definitely makes it clear that it's not actually bound to the loader instances. Signed-off-by: Daniel Silverstone <daniel.silverstone@codethink.co.uk>
-rw-r--r--src/buildstream/_loader/loader.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/buildstream/_loader/loader.py b/src/buildstream/_loader/loader.py
index ca058608d..991c517b4 100644
--- a/src/buildstream/_loader/loader.py
+++ b/src/buildstream/_loader/loader.py
@@ -338,7 +338,8 @@ class Loader():
# Raises:
# (LoadError): In case there was a circular dependency error
#
- def _check_circular_deps(self, element, check_elements=None, validated=None, sequence=None):
+ @staticmethod
+ def _check_circular_deps(element, check_elements=None, validated=None, sequence=None):
if check_elements is None:
check_elements = set()
@@ -366,7 +367,7 @@ class Loader():
check_elements.add(element)
sequence.append(element.full_name)
for dep in element.dependencies:
- dep.element._loader._check_circular_deps(dep.element, check_elements, validated, sequence)
+ Loader._check_circular_deps(dep.element, check_elements, validated, sequence)
check_elements.remove(element)
sequence.pop()