Reformat code using Black

As discussed over the mailing list, reformat code using Black. This is a
one-off change to reformat all our codebase. Moving forward, we
shouldn't expect such blanket reformats. Rather, we expect each change
to already comply with the Black formatting style.

1 files changed, 21 insertions, 39 deletions

diff --git a/src/buildstream/_includes.py b/src/buildstream/_includes.py
index c04601b91..bc0d7718b 100644
--- a/src/buildstream/_includes.py
+++ b/src/buildstream/_includes.py
@@ -14,7 +14,6 @@ from ._exceptions import LoadError, LoadErrorReason
 #                      provenance. Should be true if intended to be
 #                      serialized.
 class Includes:
-
     def __init__(self, loader, *, copy_tree=False):
         self._loader = loader
         self._loaded = {}
@@ -29,14 +28,11 @@ class Includes:
     #    included (set): Fail for recursion if trying to load any files in this set
     #    current_loader (Loader): Use alternative loader (for junction files)
     #    only_local (bool): Whether to ignore junction files
-    def process(self, node, *,
-                included=set(),
-                current_loader=None,
-                only_local=False):
+    def process(self, node, *, included=set(), current_loader=None, only_local=False):
         if current_loader is None:
             current_loader = self._loader
 
-        includes_node = node.get_node('(@)', allowed_types=[ScalarNode, SequenceNode], allow_none=True)
+        includes_node = node.get_node("(@)", allowed_types=[ScalarNode, SequenceNode], allow_none=True)
 
         if includes_node:
             if type(includes_node) is ScalarNode:  # pylint: disable=unidiomatic-typecheck
@@ -44,23 +40,24 @@ class Includes:
             else:
                 includes = includes_node.as_str_list()
 
-            del node['(@)']
+            del node["(@)"]
 
             for include in reversed(includes):
-                if only_local and ':' in include:
+                if only_local and ":" in include:
                     continue
                 try:
-                    include_node, file_path, sub_loader = self._include_file(include,
-                                                                             current_loader)
+                    include_node, file_path, sub_loader = self._include_file(include, current_loader)
                 except LoadError as e:
                     include_provenance = includes_node.get_provenance()
                     if e.reason == LoadErrorReason.MISSING_FILE:
                         message = "{}: Include block references a file that could not be found: '{}'.".format(
-                            include_provenance, include)
+                            include_provenance, include
+                        )
                         raise LoadError(message, LoadErrorReason.MISSING_FILE) from e
                     if e.reason == LoadErrorReason.LOADING_DIRECTORY:
                         message = "{}: Include block references a directory instead of a file: '{}'.".format(
-                            include_provenance, include)
+                            include_provenance, include
+                        )
                         raise LoadError(message, LoadErrorReason.LOADING_DIRECTORY) from e
 
                     # Otherwise, we don't know the reason, so just raise
@@ -68,8 +65,10 @@ class Includes:
 
                 if file_path in included:
                     include_provenance = includes_node.get_provenance()
-                    raise LoadError("{}: trying to recursively include {}". format(include_provenance, file_path),
-                                    LoadErrorReason.RECURSIVE_INCLUDE)
+                    raise LoadError(
+                        "{}: trying to recursively include {}".format(include_provenance, file_path),
+                        LoadErrorReason.RECURSIVE_INCLUDE,
+                    )
                 # Because the included node will be modified, we need
                 # to copy it so that we do not modify the toplevel
                 # node of the provenance.
@@ -77,19 +76,14 @@ class Includes:
 
                 try:
                     included.add(file_path)
-                    self.process(include_node, included=included,
-                                 current_loader=sub_loader,
-                                 only_local=only_local)
+                    self.process(include_node, included=included, current_loader=sub_loader, only_local=only_local)
                 finally:
                     included.remove(file_path)
 
                 include_node._composite_under(node)
 
         for value in node.values():
-            self._process_value(value,
-                                included=included,
-                                current_loader=current_loader,
-                                only_local=only_local)
+            self._process_value(value, included=included, current_loader=current_loader, only_local=only_local)
 
     # _include_file()
     #
@@ -101,8 +95,8 @@ class Includes:
     #    loader (Loader): Loader for the current project.
     def _include_file(self, include, loader):
         shortname = include
-        if ':' in include:
-            junction, include = include.split(':', 1)
+        if ":" in include:
+            junction, include = include.split(":", 1)
             junction_loader = loader._get_loader(junction)
             current_loader = junction_loader
         else:
@@ -112,10 +106,7 @@ class Includes:
         file_path = os.path.join(directory, include)
         key = (current_loader, file_path)
         if key not in self._loaded:
-            self._loaded[key] = _yaml.load(file_path,
-                                           shortname=shortname,
-                                           project=project,
-                                           copy_tree=self._copy_tree)
+            self._loaded[key] = _yaml.load(file_path, shortname=shortname, project=project, copy_tree=self._copy_tree)
         return self._loaded[key], file_path, current_loader
 
     # _process_value()
@@ -127,20 +118,11 @@ class Includes:
     #    included (set): Fail for recursion if trying to load any files in this set
     #    current_loader (Loader): Use alternative loader (for junction files)
     #    only_local (bool): Whether to ignore junction files
-    def _process_value(self, value, *,
-                       included=set(),
-                       current_loader=None,
-                       only_local=False):
+    def _process_value(self, value, *, included=set(), current_loader=None, only_local=False):
         value_type = type(value)
 
         if value_type is MappingNode:
-            self.process(value,
-                         included=included,
-                         current_loader=current_loader,
-                         only_local=only_local)
+            self.process(value, included=included, current_loader=current_loader, only_local=only_local)
         elif value_type is SequenceNode:
             for v in value:
-                self._process_value(v,
-                                    included=included,
-                                    current_loader=current_loader,
-                                    only_local=only_local)
+                self._process_value(v, included=included, current_loader=current_loader, only_local=only_local)