diff options
author | Marc Mueller <30130371+cdce8p@users.noreply.github.com> | 2023-04-25 17:47:06 +0200 |
---|---|---|
committer | Daniƫl van Noord <13665637+DanielNoord@users.noreply.github.com> | 2023-04-25 18:59:12 +0200 |
commit | 6865b2b04a22ccee4a34016520e667d5e517740d (patch) | |
tree | ea2afeff2c284d8376bff97a320146fd5f121f9a | |
parent | 306e8fb11a2069b01caa91f0c51dcd16eb09f981 (diff) | |
download | astroid-git-6865b2b04a22ccee4a34016520e667d5e517740d.tar.gz |
Remove deprecated nodes
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | astroid/__init__.py | 5 | ||||
-rw-r--r-- | astroid/node_classes.py | 5 | ||||
-rw-r--r-- | astroid/nodes/__init__.py | 11 | ||||
-rw-r--r-- | astroid/nodes/node_classes.py | 30 | ||||
-rw-r--r-- | doc/api/astroid.nodes.rst | 9 |
6 files changed, 7 insertions, 57 deletions
@@ -121,6 +121,10 @@ Release date: TBA Refs #2141 +* Remove deprecated ``Ellipsis``, ``ExtSlice``, ``Index`` nodes. + + Refs #2152 + What's New in astroid 2.15.5? ============================= diff --git a/astroid/__init__.py b/astroid/__init__.py index d1251191..f3c2c790 100644 --- a/astroid/__init__.py +++ b/astroid/__init__.py @@ -86,7 +86,7 @@ from astroid.objects import ExceptionInstance # 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 @@ from astroid.nodes import ( # pylint: disable=redefined-builtin (Ellipsis) Dict, DictComp, DictUnpack, - Ellipsis, EmptyNode, EvaluatedObject, ExceptHandler, Expr, - ExtSlice, For, FormattedValue, FunctionDef, @@ -132,7 +130,6 @@ from astroid.nodes import ( # pylint: disable=redefined-builtin (Ellipsis) IfExp, Import, ImportFrom, - Index, JoinedStr, Keyword, Lambda, diff --git a/astroid/node_classes.py b/astroid/node_classes.py index fecb006e..980fa0a9 100644 --- a/astroid/node_classes.py +++ b/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,12 +34,10 @@ from astroid.nodes.node_classes import ( # pylint: disable=redefined-builtin (E DelName, Dict, DictUnpack, - Ellipsis, EmptyNode, EvaluatedObject, ExceptHandler, Expr, - ExtSlice, For, FormattedValue, Global, @@ -47,7 +45,6 @@ from astroid.nodes.node_classes import ( # pylint: disable=redefined-builtin (E IfExp, Import, ImportFrom, - Index, JoinedStr, Keyword, List, diff --git a/astroid/nodes/__init__.py b/astroid/nodes/__init__.py index d67c6a5b..f677ff50 100644 --- a/astroid/nodes/__init__.py +++ b/astroid/nodes/__init__.py @@ -15,7 +15,7 @@ All nodes inherit from :class:`~astroid.nodes.node_classes.NodeNG`. # 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,12 +43,10 @@ from astroid.nodes.node_classes import ( # pylint: disable=redefined-builtin (E DelName, Dict, DictUnpack, - Ellipsis, EmptyNode, EvaluatedObject, ExceptHandler, Expr, - ExtSlice, For, FormattedValue, Global, @@ -56,7 +54,6 @@ from astroid.nodes.node_classes import ( # pylint: disable=redefined-builtin (E IfExp, Import, ImportFrom, - Index, JoinedStr, Keyword, List, @@ -149,12 +146,10 @@ ALL_NODE_CLASSES = ( Dict, DictComp, DictUnpack, - Ellipsis, EmptyNode, EvaluatedObject, ExceptHandler, Expr, - ExtSlice, For, FormattedValue, FunctionDef, @@ -164,7 +159,6 @@ ALL_NODE_CLASSES = ( IfExp, Import, ImportFrom, - Index, JoinedStr, Keyword, Lambda, @@ -241,12 +235,10 @@ __all__ = ( "Dict", "DictComp", "DictUnpack", - "Ellipsis", "EmptyNode", "EvaluatedObject", "ExceptHandler", "Expr", - "ExtSlice", "For", "FormattedValue", "FunctionDef", @@ -258,7 +250,6 @@ __all__ = ( "IfExp", "Import", "ImportFrom", - "Index", "JoinedStr", "Keyword", "Lambda", diff --git a/astroid/nodes/node_classes.py b/astroid/nodes/node_classes.py index d6833a31..9df654c5 100644 --- a/astroid/nodes/node_classes.py +++ b/astroid/nodes/node_classes.py @@ -2035,16 +2035,6 @@ class Expr(_base_nodes.Statement): 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 @@ class ExceptHandler( 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 @@ class Import(_base_nodes.ImportNode): ) -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. diff --git a/doc/api/astroid.nodes.rst b/doc/api/astroid.nodes.rst index 3e99e93b..7783b45d 100644 --- a/doc/api/astroid.nodes.rst +++ b/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 |