diff options
Diffstat (limited to 'astroid')
| -rw-r--r-- | astroid/mixins.py | 35 | ||||
| -rw-r--r-- | astroid/node_classes.py | 201 | ||||
| -rw-r--r-- | astroid/scoped_nodes.py | 25 |
3 files changed, 55 insertions, 206 deletions
diff --git a/astroid/mixins.py b/astroid/mixins.py index 739828d5..be5352f0 100644 --- a/astroid/mixins.py +++ b/astroid/mixins.py @@ -131,3 +131,38 @@ class ImportFromMixin(FilterStmtsMixin): raise exceptions.AttributeInferenceError( 'Could not find original name for {attribute} in {target!r}', target=self, attribute=asname) + + +class MultiLineBlockMixin: + """Mixin for nodes with multi-line blocks, e.g. For and FunctionDef. + Note that this does not apply to every node with a `body` field. + For instance, an If node has a multi-line body, but the body of an + IfExpr is not multi-line, and hence cannot contain Return nodes, + Assign nodes, etc. + """ + + @decorators.cachedproperty + def _multi_line_blocks(self): + return tuple( + getattr(self, field) + for field in self._multi_line_block_fields + ) + + def _get_return_nodes_skip_functions(self): + for block in self._multi_line_blocks: + for child_node in block: + if child_node.is_function: + continue + yield from child_node._get_return_nodes_skip_functions() + + def _get_yield_nodes_skip_lambdas(self): + for block in self._multi_line_blocks: + for child_node in block: + if child_node.is_lambda: + continue + yield from child_node._get_yield_nodes_skip_lambdas() + + def _get_assign_nodes(self): + for block in self._multi_line_blocks: + for child_node in block: + yield from child_node._get_assign_nodes() diff --git a/astroid/node_classes.py b/astroid/node_classes.py index 0e1db684..c9b70102 100644 --- a/astroid/node_classes.py +++ b/astroid/node_classes.py @@ -2741,7 +2741,8 @@ class EmptyNode(NodeNG): yield from () -class ExceptHandler(mixins.AssignTypeMixin, Statement): +class ExceptHandler(mixins.MultiLineBlockMixin, + mixins.AssignTypeMixin, Statement): """Class representing an :class:`ast.ExceptHandler`. node. An :class:`ExceptHandler` is an ``except`` block on a try-except. @@ -2758,6 +2759,7 @@ class ExceptHandler(mixins.AssignTypeMixin, Statement): [<ExceptHandler l.4 at 0x7f23b2e9e860>] """ _astroid_fields = ('type', 'name', 'body',) + _multi_line_block_fields = ('body',) type = None """The types that the block handles. @@ -2828,18 +2830,6 @@ class ExceptHandler(mixins.AssignTypeMixin, Statement): return True return False - def _get_return_nodes_skip_functions(self): - for child_node in self.body: - if child_node.is_function: - continue - yield from child_node._get_return_nodes_skip_functions() - - def _get_yield_nodes_skip_lambdas(self): - for child_node in self.body: - if child_node.is_lambda: - continue - yield from child_node._get_yield_nodes_skip_lambdas() - class Exec(Statement): """Class representing the ``exec`` statement. @@ -2910,7 +2900,8 @@ class ExtSlice(NodeNG): self.dims = dims -class For(mixins.BlockRangeMixIn, mixins.AssignTypeMixin, Statement): +class For(mixins.MultiLineBlockMixin, mixins.BlockRangeMixIn, + mixins.AssignTypeMixin, Statement): """Class representing an :class:`ast.For` node. >>> node = astroid.extract_node('for thing in things: print(thing)') @@ -2918,6 +2909,7 @@ class For(mixins.BlockRangeMixIn, mixins.AssignTypeMixin, Statement): <For l.1 at 0x7f23b2e8cf28> """ _astroid_fields = ('target', 'iter', 'body', 'orelse',) + _multi_line_block_fields = ('body', 'orelse') target = None """What the loop assigns to. @@ -2983,35 +2975,6 @@ class For(mixins.BlockRangeMixIn, mixins.AssignTypeMixin, Statement): yield from self.body yield from self.orelse - def _get_assign_nodes(self): - for child_node in self.body: - yield from child_node._get_assign_nodes() - - for child_node in self.orelse: - yield from child_node._get_assign_nodes() - - def _get_return_nodes_skip_functions(self): - for child_node in self.body: - if child_node.is_function: - continue - yield from child_node._get_return_nodes_skip_functions() - - for child_node in self.orelse: - if child_node.is_function: - continue - yield from child_node._get_return_nodes_skip_functions() - - def _get_yield_nodes_skip_lambdas(self): - for child_node in self.body: - if child_node.is_lambda: - continue - yield from child_node._get_yield_nodes_skip_lambdas() - - for child_node in self.orelse: - if child_node.is_lambda: - continue - yield from child_node._get_yield_nodes_skip_lambdas() - class AsyncFor(For): """Class representing an :class:`ast.AsyncFor` node. @@ -3214,7 +3177,7 @@ class Global(Statement): yield from () -class If(mixins.BlockRangeMixIn, Statement): +class If(mixins.MultiLineBlockMixin, mixins.BlockRangeMixIn, Statement): """Class representing an :class:`ast.If` node. >>> node = astroid.extract_node('if condition: print(True)') @@ -3222,6 +3185,7 @@ class If(mixins.BlockRangeMixIn, Statement): <If l.1 at 0x7f23b2e9dd30> """ _astroid_fields = ('test', 'body', 'orelse') + _multi_line_block_fields = ('body', 'orelse') test = None """The condition that the statement tests. @@ -3285,35 +3249,6 @@ class If(mixins.BlockRangeMixIn, Statement): yield from self.body yield from self.orelse - def _get_assign_nodes(self): - for child_node in self.body: - yield from child_node._get_assign_nodes() - - for child_node in self.orelse: - yield from child_node._get_assign_nodes() - - def _get_return_nodes_skip_functions(self): - for child_node in self.body: - if child_node.is_function: - continue - yield from child_node._get_return_nodes_skip_functions() - - for child_node in self.orelse: - if child_node.is_function: - continue - yield from child_node._get_return_nodes_skip_functions() - - def _get_yield_nodes_skip_lambdas(self): - for child_node in self.body: - if child_node.is_lambda: - continue - yield from child_node._get_yield_nodes_skip_lambdas() - - for child_node in self.orelse: - if child_node.is_lambda: - continue - yield from child_node._get_yield_nodes_skip_lambdas() - class IfExp(NodeNG): """Class representing an :class:`ast.IfExp` node. @@ -3952,7 +3887,7 @@ class Subscript(NodeNG): yield self.slice -class TryExcept(mixins.BlockRangeMixIn, Statement): +class TryExcept(mixins.MultiLineBlockMixin, mixins.BlockRangeMixIn, Statement): """Class representing an :class:`ast.TryExcept` node. >>> node = astroid.extract_node(''' @@ -3965,6 +3900,7 @@ class TryExcept(mixins.BlockRangeMixIn, Statement): <TryExcept l.2 at 0x7f23b2e9d908> """ _astroid_fields = ('body', 'handlers', 'orelse',) + _multi_line_block_fields = ('body', 'orelse') body = None """The contents of the block to catch exceptions from. @@ -4026,38 +3962,9 @@ class TryExcept(mixins.BlockRangeMixIn, Statement): yield from self.handlers or () yield from self.orelse or () - def _get_assign_nodes(self): - for child_node in self.body: - yield from child_node._get_assign_nodes() - - for child_node in self.orelse: - yield from child_node._get_assign_nodes() - - def _get_return_nodes_skip_functions(self): - for child_node in self.body: - if child_node.is_function: - continue - yield from child_node._get_return_nodes_skip_functions() - - for child_node in self.orelse or (): - if child_node.is_function: - continue - for matching in child_node._get_return_nodes_skip_functions(): - yield matching - - def _get_yield_nodes_skip_lambdas(self): - for child_node in self.body: - if child_node.is_lambda: - continue - yield from child_node._get_yield_nodes_skip_lambdas() - - for child_node in self.orelse: - if child_node.is_lambda: - continue - yield from child_node._get_yield_nodes_skip_lambdas() - -class TryFinally(mixins.BlockRangeMixIn, Statement): +class TryFinally(mixins.MultiLineBlockMixin, + mixins.BlockRangeMixIn, Statement): """Class representing an :class:`ast.TryFinally` node. >>> node = astroid.extract_node(''' @@ -4072,6 +3979,7 @@ class TryFinally(mixins.BlockRangeMixIn, Statement): <TryFinally l.2 at 0x7f23b2e41d68> """ _astroid_fields = ('body', 'finalbody',) + _multi_line_block_fields = ('body', 'finalbody') body = None """The try-except that the finally is attached to. @@ -4116,36 +4024,6 @@ class TryFinally(mixins.BlockRangeMixIn, Statement): yield from self.body yield from self.finalbody - def _get_assign_nodes(self): - for child_node in self.body: - yield from child_node._get_assign_nodes() - - for child_node in self.finalbody: - yield from child_node._get_assign_nodes() - - def _get_return_nodes_skip_functions(self): - for child_node in self.body: - if child_node.is_function: - continue - yield from child_node._get_return_nodes_skip_functions() - - for child_node in self.finalbody: - if child_node.is_function: - continue - for matching in child_node._get_return_nodes_skip_functions(): - yield matching - - def _get_yield_nodes_skip_lambdas(self): - for child_node in self.body: - if child_node.is_lambda: - continue - yield from child_node._get_yield_nodes_skip_lambdas() - - for child_node in self.finalbody: - if child_node.is_lambda: - continue - yield from child_node._get_yield_nodes_skip_lambdas() - class Tuple(_BaseContainer): """Class representing an :class:`ast.Tuple` node. @@ -4268,7 +4146,7 @@ class UnaryOp(NodeNG): yield self.operand -class While(mixins.BlockRangeMixIn, Statement): +class While(mixins.MultiLineBlockMixin, mixins.BlockRangeMixIn, Statement): """Class representing an :class:`ast.While` node. >>> node = astroid.extract_node(''' @@ -4279,6 +4157,7 @@ class While(mixins.BlockRangeMixIn, Statement): <While l.2 at 0x7f23b2e4e390> """ _astroid_fields = ('test', 'body', 'orelse',) + _multi_line_block_fields = ('body', 'orelse') test = None """The condition that the loop tests. @@ -4337,38 +4216,9 @@ class While(mixins.BlockRangeMixIn, Statement): yield from self.body yield from self.orelse - def _get_assign_nodes(self): - for child_node in self.body: - yield from child_node._get_assign_nodes() - - for child_node in self.orelse: - yield from child_node._get_assign_nodes() - def _get_return_nodes_skip_functions(self): - for child_node in self.body: - if child_node.is_function: - continue - yield from child_node._get_return_nodes_skip_functions() - - for child_node in self.orelse: - if child_node.is_function: - continue - for matching in child_node._get_return_nodes_skip_functions(): - yield matching - - def _get_yield_nodes_skip_lambdas(self): - for child_node in self.body: - if child_node.is_lambda: - continue - yield from child_node._get_yield_nodes_skip_lambdas() - - for child_node in self.orelse: - if child_node.is_lambda: - continue - yield from child_node._get_yield_nodes_skip_lambdas() - - -class With(mixins.BlockRangeMixIn, mixins.AssignTypeMixin, Statement): +class With(mixins.MultiLineBlockMixin, mixins.BlockRangeMixIn, + mixins.AssignTypeMixin, Statement): """Class representing an :class:`ast.With` node. >>> node = astroid.extract_node(''' @@ -4379,6 +4229,7 @@ class With(mixins.BlockRangeMixIn, mixins.AssignTypeMixin, Statement): <With l.2 at 0x7f23b2e4e710> """ _astroid_fields = ('items', 'body') + _multi_line_block_fields = ('body',) items = None """The pairs of context managers and the names they are assigned to. @@ -4424,22 +4275,6 @@ class With(mixins.BlockRangeMixIn, mixins.AssignTypeMixin, Statement): for elt in self.body: yield elt - def _get_assign_nodes(self): - for child_node in self.body: - yield from child_node._get_assign_nodes() - - def _get_return_nodes_skip_functions(self): - for child_node in self.body: - if child_node.is_function: - continue - yield from child_node._get_return_nodes_skip_functions() - - def _get_yield_nodes_skip_lambdas(self): - for child_node in self.body: - if child_node.is_lambda: - continue - yield from child_node._get_yield_nodes_skip_lambdas() - class AsyncWith(With): """Asynchronous ``with`` built with the ``async`` keyword.""" diff --git a/astroid/scoped_nodes.py b/astroid/scoped_nodes.py index d1ee2c0f..c0d75b5a 100644 --- a/astroid/scoped_nodes.py +++ b/astroid/scoped_nodes.py @@ -1205,7 +1205,7 @@ class Lambda(mixins.FilterStmtsMixin, LocalsDictNodeNG): yield self.body -class FunctionDef(node_classes.Statement, Lambda): +class FunctionDef(mixins.MultiLineBlockMixin, node_classes.Statement, Lambda): """Class representing an :class:`ast.FunctionDef`. >>> node = astroid.extract_node(''' @@ -1216,6 +1216,7 @@ class FunctionDef(node_classes.Statement, Lambda): <FunctionDef.my_func l.2 at 0x7f23b2e71e10> """ _astroid_fields = ('decorators', 'args', 'returns', 'body') + _multi_line_block_fields = ('body',) returns = None decorators = None """The decorators that are applied to this method or function. @@ -1594,22 +1595,6 @@ class FunctionDef(node_classes.Statement, Lambda): for elt in self.body: yield elt - def _get_assign_nodes(self): - for child_node in self.body: - yield from child_node._get_assign_nodes() - - def _get_return_nodes_skip_functions(self): - for child_node in self.body: - if child_node.is_function: - continue - yield from child_node._get_return_nodes_skip_functions() - - def _get_yield_nodes_skip_lambdas(self): - for child_node in self.body: - if child_node.is_lambda: - continue - yield from child_node._get_yield_nodes_skip_lambdas() - class AsyncFunctionDef(FunctionDef): """Class representing an :class:`ast.FunctionDef` node. @@ -2720,12 +2705,6 @@ class ClassDef(mixins.FilterStmtsMixin, LocalsDictNodeNG, for child_node in self.body: yield from child_node._get_assign_nodes() - def _get_yield_nodes_skip_lambdas(self): - for child_node in self.body: - if child_node.is_lambda: - continue - yield from child_node._get_yield_nodes_skip_lambdas() - # Backwards-compatibility aliases Class = util.proxy_alias('Class', ClassDef) |