Adopt "future" behavior of statement() and frame()

Author: jacobtylerwalls

ChangeLog

@@ -146,6 +146,12 @@ Release date: TBA
 
   Refs #2141
 
+* ``frame()`` raises ``ParentMissingError`` and ``statement()`` raises ``StatementMissing`` for
+  missing parents regardless of the value of the ``future`` argument (which gave this behavior
+  already).
+
+  Refs #1217
+
 * Remove deprecated ``Ellipsis``, ``ExtSlice``, ``Index`` nodes.
 
   Refs #2152

astroid/nodes/node_ng.py

@@ -288,39 +288,15 @@ def parent_of(self, node) -> bool:
         """
         return any(self is parent for parent in node.node_ancestors())
 
-    @overload
-    def statement(self, *, future: None = ...) -> nodes.Statement | nodes.Module:
-        ...
-
-    @overload
-    def statement(self, *, future: Literal[True]) -> nodes.Statement:
-        ...
-
-    def statement(
-        self, *, future: Literal[None, True] = None
-    ) -> nodes.Statement | nodes.Module:
+    def statement(self, *, future: Literal[None, True] = None) -> nodes.Statement:
         """The first parent node, including self, marked as statement node.
 
-        TODO: Deprecate the future parameter and only raise StatementMissing and return
-        nodes.Statement
-
-        :raises AttributeError: If self has no parent attribute
-        :raises StatementMissing: If self has no parent attribute and future is True
+        :raises StatementMissing: If self has no parent attribute.
         """
         if self.is_statement:
             return cast("nodes.Statement", self)
         if not self.parent:
-            if future:
-                raise StatementMissing(target=self)
-            warnings.warn(
-                "In astroid 3.0.0 NodeNG.statement() will return either a nodes.Statement "
-                "or raise a StatementMissing exception. AttributeError will no longer be raised. "
-                "This behaviour can already be triggered "
-                "by passing 'future=True' to a statement() call.",
-                DeprecationWarning,
-                stacklevel=2,
-            )
-            raise AttributeError(f"{self} object has no attribute 'parent'")
+            raise StatementMissing(target=self)
         return self.parent.statement(future=future)
 
     def frame(
@@ -332,20 +308,10 @@ def frame(
         :class:`ClassDef` or :class:`Lambda`.
 
         :returns: The first parent frame node.
+        :raises ParentMissingError: If self has no parent attribute.
         """
         if self.parent is None:
-            if future:
-                raise ParentMissingError(target=self)
-            warnings.warn(
-                "In astroid 3.0.0 NodeNG.frame() will return either a Frame node, "
-                "or raise ParentMissingError. AttributeError will no longer be raised. "
-                "This behaviour can already be triggered "
-                "by passing 'future=True' to a frame() call.",
-                DeprecationWarning,
-                stacklevel=2,
-            )
-            raise AttributeError(f"{self} object has no attribute 'parent'")
-
+            raise ParentMissingError(target=self)
         return self.parent.frame(future=future)
 
     def scope(self) -> nodes.LocalsDictNodeNG:

astroid/nodes/scoped_nodes/scoped_nodes.py

@@ -16,7 +16,7 @@
 import warnings
 from collections.abc import Generator, Iterable, Iterator, Sequence
 from functools import cached_property, lru_cache
-from typing import TYPE_CHECKING, ClassVar, Literal, NoReturn, TypeVar, overload
+from typing import TYPE_CHECKING, ClassVar, Literal, NoReturn, TypeVar
 
 from astroid import bases, util
 from astroid.const import IS_PYPY, PY38, PY39_PLUS, PYPY_7_3_11_PLUS
@@ -377,34 +377,12 @@ def fully_defined(self) -> bool:
         """
         return self.file is not None and self.file.endswith(".py")
 
-    @overload
-    def statement(self, *, future: None = ...) -> Module:
-        ...
-
-    @overload
-    def statement(self, *, future: Literal[True]) -> NoReturn:
-        ...
-
-    def statement(self, *, future: Literal[None, True] = None) -> Module | NoReturn:
+    def statement(self, *, future: Literal[None, True] = None) -> NoReturn:
         """The first parent node, including self, marked as statement node.
 
-        When called on a :class:`Module` with the future parameter this raises an error.
-
-        TODO: Deprecate the future parameter and only raise StatementMissing
-
-        :raises StatementMissing: If no self has no parent attribute and future is True
+        When called on a :class:`Module` this raises a StatementMissing.
         """
-        if future:
-            raise StatementMissing(target=self)
-        warnings.warn(
-            "In astroid 3.0.0 NodeNG.statement() will return either a nodes.Statement "
-            "or raise a StatementMissing exception. nodes.Module will no longer be "
-            "considered a statement. This behaviour can already be triggered "
-            "by passing 'future=True' to a statement() call.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        return self
+        raise StatementMissing(target=self)
 
     def previous_sibling(self):
         """The previous sibling statement.