Merge branch 'main' into remove-doc

Author: DanielNoord

ChangeLog

@@ -110,6 +110,11 @@ Release date: TBA
 
   Refs #1490
 
+* Remove deprecated ``doc`` attribute for ``Module``, ``ClassDef``, and ``FunctionDef``.
+  Use the ``doc_node`` attribute instead.
+
+  Refs #2154
+
 * Remove unused and / or deprecated constants:
   - ``astroid.bases.BOOL_SPECIAL_METHOD``
   - ``astroid.bases.BUILTINS``
@@ -121,10 +126,9 @@ Release date: TBA
 
   Refs #2141
 
-* Remove deprecated ``doc`` attribute for ``Module``, ``ClassDef``, and ``FunctionDef``.
-  Use the ``doc_node`` attribute instead.
+* Remove deprecated ``Ellipsis``, ``ExtSlice``, ``Index`` nodes.
 
-  Refs #2154
+  Refs #2152
 
 
 What's New in astroid 2.15.5?

astroid/__init__.py

@@ -86,7 +86,7 @@
 # and we need astroid/scoped_nodes and astroid/node_classes to work. So
 # importing with a wildcard would clash with astroid/nodes/scoped_nodes
 # and astroid/nodes/node_classes.
-from astroid.nodes import (  # pylint: disable=redefined-builtin (Ellipsis)
+from astroid.nodes import (
     CONST_CLS,
     AnnAssign,
     Arguments,
@@ -117,12 +117,10 @@
     Dict,
     DictComp,
     DictUnpack,
-    Ellipsis,
     EmptyNode,
     EvaluatedObject,
     ExceptHandler,
     Expr,
-    ExtSlice,
     For,
     FormattedValue,
     FunctionDef,
@@ -132,7 +130,6 @@
     IfExp,
     Import,
     ImportFrom,
-    Index,
     JoinedStr,
     Keyword,
     Lambda,

astroid/node_classes.py

@@ -6,7 +6,7 @@
 
 import warnings
 
-from astroid.nodes.node_classes import (  # pylint: disable=redefined-builtin (Ellipsis)
+from astroid.nodes.node_classes import (
     CONST_CLS,
     AnnAssign,
     Arguments,
@@ -34,20 +34,17 @@
     DelName,
     Dict,
     DictUnpack,
-    Ellipsis,
     EmptyNode,
     EvaluatedObject,
     ExceptHandler,
     Expr,
-    ExtSlice,
     For,
     FormattedValue,
     Global,
     If,
     IfExp,
     Import,
     ImportFrom,
-    Index,
     JoinedStr,
     Keyword,
     List,

astroid/nodes/__init__.py

@@ -15,7 +15,7 @@
 # This is the only node we re-export from the private _base_nodes module. This
 # is because it was originally part of the public API and hasn't been deprecated.
 from astroid.nodes._base_nodes import Statement
-from astroid.nodes.node_classes import (  # pylint: disable=redefined-builtin (Ellipsis)
+from astroid.nodes.node_classes import (
     CONST_CLS,
     AnnAssign,
     Arguments,
@@ -43,20 +43,17 @@
     DelName,
     Dict,
     DictUnpack,
-    Ellipsis,
     EmptyNode,
     EvaluatedObject,
     ExceptHandler,
     Expr,
-    ExtSlice,
     For,
     FormattedValue,
     Global,
     If,
     IfExp,
     Import,
     ImportFrom,
-    Index,
     JoinedStr,
     Keyword,
     List,
@@ -149,12 +146,10 @@
     Dict,
     DictComp,
     DictUnpack,
-    Ellipsis,
     EmptyNode,
     EvaluatedObject,
     ExceptHandler,
     Expr,
-    ExtSlice,
     For,
     FormattedValue,
     FunctionDef,
@@ -164,7 +159,6 @@
     IfExp,
     Import,
     ImportFrom,
-    Index,
     JoinedStr,
     Keyword,
     Lambda,
@@ -241,12 +235,10 @@
     "Dict",
     "DictComp",
     "DictUnpack",
-    "Ellipsis",
     "EmptyNode",
     "EvaluatedObject",
     "ExceptHandler",
     "Expr",
-    "ExtSlice",
     "For",
     "FormattedValue",
     "FunctionDef",
@@ -258,7 +250,6 @@
     "IfExp",
     "Import",
     "ImportFrom",
-    "Index",
     "JoinedStr",
     "Keyword",
     "Lambda",

astroid/nodes/node_classes.py

@@ -2035,16 +2035,6 @@ def _get_yield_nodes_skip_lambdas(self):
             yield from self.value._get_yield_nodes_skip_lambdas()
 
 
-class Ellipsis(_base_nodes.NoChildrenNode):  # pylint: disable=redefined-builtin
-    """Class representing an :class:`ast.Ellipsis` node.
-
-    An :class:`Ellipsis` is the ``...`` syntax.
-
-    Deprecated since v2.6.0 - Use :class:`Const` instead.
-    Will be removed with the release v2.7.0
-    """
-
-
 class EmptyNode(_base_nodes.NoChildrenNode):
     """Holds an arbitrary object in the :attr:`LocalsDictNodeNG.locals`."""
 
@@ -2149,16 +2139,6 @@ def catch(self, exceptions: list[str] | None) -> bool:
         return any(node.name in exceptions for node in self.type._get_name_nodes())
 
 
-class ExtSlice(NodeNG):
-    """Class representing an :class:`ast.ExtSlice` node.
-
-    An :class:`ExtSlice` is a complex slice expression.
-
-    Deprecated since v2.6.0 - Now part of the :class:`Subscript` node.
-    Will be removed with the release of v2.7.0
-    """
-
-
 class For(
     _base_nodes.MultiLineWithElseBlockNode,
     _base_nodes.AssignTypeNode,
@@ -2644,16 +2624,6 @@ def __init__(
         )
 
 
-class Index(NodeNG):
-    """Class representing an :class:`ast.Index` node.
-
-    An :class:`Index` is a simple subscript.
-
-    Deprecated since v2.6.0 - Now part of the :class:`Subscript` node.
-    Will be removed with the release of v2.7.0
-    """
-
-
 class Keyword(NodeNG):
     """Class representing an :class:`ast.keyword` node.
 

doc/api/astroid.nodes.rst

@@ -37,11 +37,9 @@ Nodes
    astroid.nodes.Dict
    astroid.nodes.DictComp
    astroid.nodes.DictUnpack
-   astroid.nodes.Ellipsis
    astroid.nodes.EmptyNode
    astroid.nodes.ExceptHandler
    astroid.nodes.Expr
-   astroid.nodes.ExtSlice
    astroid.nodes.For
    astroid.nodes.FormattedValue
    astroid.nodes.FunctionDef
@@ -51,7 +49,6 @@ Nodes
    astroid.nodes.IfExp
    astroid.nodes.Import
    astroid.nodes.ImportFrom
-   astroid.nodes.Index
    astroid.nodes.JoinedStr
    astroid.nodes.Keyword
    astroid.nodes.Lambda
@@ -145,16 +142,12 @@ Nodes
 
 .. autoclass:: astroid.nodes.DictUnpack
 
-.. autoclass:: astroid.nodes.Ellipsis
-
 .. autoclass:: astroid.nodes.EmptyNode
 
 .. autoclass:: astroid.nodes.ExceptHandler
 
 .. autoclass:: astroid.nodes.Expr
 
-.. autoclass:: astroid.nodes.ExtSlice
-
 .. autoclass:: astroid.nodes.For
 
 .. autoclass:: astroid.nodes.FormattedValue
@@ -173,8 +166,6 @@ Nodes
 
 .. autoclass:: astroid.nodes.ImportFrom
 
-.. autoclass:: astroid.nodes.Index
-
 .. autoclass:: astroid.nodes.JoinedStr
 
 .. autoclass:: astroid.nodes.Keyword