From 22348df183700965edb00814a4e530cdd797ef9d Mon Sep 17 00:00:00 2001
From: Nathan Williams <nathan.williams@codethink.co.uk>
Date: Fri, 17 Jul 2026 14:09:14 +0100
Subject: [PATCH] Element: Remove unused & deprecated node_subst methods

These deprecation notices were introduced into the codebase 6 years ago (April 16th, 2020 5:56
PM)
There have been many Buildstream versions since then, a search in the Buildstream codebase shows
they are unused, so it's about time they are removed.
---
 src/buildstream/_elementproxy.py |  6 ----
 src/buildstream/element.py       | 49 --------------------------------
 2 files changed, 55 deletions(-)

diff --git a/src/buildstream/_elementproxy.py b/src/buildstream/_elementproxy.py
index 3425b6cc3..84158a4c8 100644
--- a/src/buildstream/_elementproxy.py
+++ b/src/buildstream/_elementproxy.py
@@ -76,12 +76,6 @@ def search(self, name: str) -> Optional["Element"]:
         #
         return cast("Element", self._plugin)._search(_Scope.RUN, name)
 
-    def node_subst_vars(self, node: "ScalarNode") -> str:
-        return cast("Element", self._plugin).node_subst_vars(node)
-
-    def node_subst_sequence_vars(self, node: "SequenceNode[ScalarNode]") -> List[str]:
-        return cast("Element", self._plugin).node_subst_sequence_vars(node)
-
     def compute_manifest(
         self, *, include: Optional[List[str]] = None, exclude: Optional[List[str]] = None, orphans: bool = True
     ) -> str:
diff --git a/src/buildstream/element.py b/src/buildstream/element.py
index 6ac1ff1eb..aa21f2df3 100644
--- a/src/buildstream/element.py
+++ b/src/buildstream/element.py
@@ -505,55 +505,6 @@ def search(self, name: str) -> Optional["Element"]:
 
         return None
 
-    def node_subst_vars(self, node: "ScalarNode") -> str:
-        """Replace any variables in the string contained in the node and returns it.
-
-        **Warning**: The method is deprecated and will get removed in the next version
-
-        Args:
-           node: A ScalarNode loaded from YAML
-
-        Returns:
-           The value with all variables replaced
-
-        Raises:
-           :class:`.LoadError`: When the node doesn't contain a string or a variable was not found.
-
-        **Example:**
-
-        .. code:: python
-
-          # Expect a string 'name' in 'node', substituting any
-          # variables in the returned string
-          name = self.node_subst_vars(node.get_scalar('name'))
-        """
-        # FIXME: remove this
-        warnings.warn(
-            "configuration is now automatically expanded, this is a no-op and will be removed.", DeprecationWarning
-        )
-        return node.as_str()
-
-    def node_subst_sequence_vars(self, node: "SequenceNode[ScalarNode]") -> List[str]:
-        """Substitute any variables in the given sequence
-
-        **Warning**: The method is deprecated and will get removed in the next version
-
-        Args:
-          node: A SequenceNode loaded from YAML
-
-        Returns:
-          The list with every variable replaced
-
-        Raises:
-          :class:`.LoadError`
-
-        """
-        # FIXME: remove this
-        warnings.warn(
-            "configuration is now automatically expanded, this is a no-op and will be removed.", DeprecationWarning
-        )
-        return node.as_str_list()
-
     def compute_manifest(
         self, *, include: Optional[List[str]] = None, exclude: Optional[List[str]] = None, orphans: bool = True
     ) -> str: