Skip to content

Commit

Permalink
Fix infer_call_result() crash on methods called with_metaclass() (#2118)
Browse files Browse the repository at this point in the history
  • Loading branch information
jacobtylerwalls committed Apr 16, 2023
1 parent 85b6984 commit 309ca8d
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 1 deletion.
3 changes: 3 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ What's New in astroid 2.15.3?
=============================
Release date: TBA

* Fix ``infer_call_result()`` crash on methods called ``with_metaclass()``.

Closes #1735


What's New in astroid 2.15.2?
Expand Down
10 changes: 9 additions & 1 deletion astroid/nodes/scoped_nodes/scoped_nodes.py
Original file line number Diff line number Diff line change
Expand Up @@ -1697,10 +1697,18 @@ def infer_call_result(self, caller=None, context: InferenceContext | None = None
# generators, and filter it out later.
if (
self.name == "with_metaclass"
and caller is not None
and len(self.args.args) == 1
and self.args.vararg is not None
):
metaclass = next(caller.args[0].infer(context), None)
if isinstance(caller.args, Arguments):
metaclass = next(caller.args.args[0].infer(context), None)
elif isinstance(caller.args, list):
metaclass = next(caller.args[0].infer(context), None)
else:
raise TypeError( # pragma: no cover
f"caller.args was neither Arguments nor list; got {type(caller.args)}"
)
if isinstance(metaclass, ClassDef):
try:
class_bases = [
Expand Down
5 changes: 5 additions & 0 deletions tests/test_inference.py
Original file line number Diff line number Diff line change
Expand Up @@ -4048,6 +4048,11 @@ class C:
inferred = next(node.infer())
self.assertRaises(InferenceError, next, inferred.infer_call_result(node))

def test_infer_call_result_with_metaclass(self) -> None:
node = extract_node("def with_metaclass(meta, *bases): return 42")
inferred = next(node.infer_call_result(caller=node))
self.assertIsInstance(inferred, nodes.Const)

def test_context_call_for_context_managers(self) -> None:
ast_nodes = extract_node(
"""
Expand Down

0 comments on commit 309ca8d

Please sign in to comment.