Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Lib/asyncio/graph.py
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,9 @@ def capture_call_graph(
f = sys._getframe(depth) if limit != 0 else None
try:
while f is not None:
is_async = f.f_generator is not None
# gh-156988: sync gen should not clear the call chain
is_async = isinstance(
f.f_generator, (types.CoroutineType, types.AsyncGeneratorType))
call_stack.append(FrameCallGraphEntry(f))

if is_async:
Expand Down
20 changes: 20 additions & 0 deletions Lib/test/test_asyncio/test_graph.py
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,26 @@ async def boom():
self.assertEqual(asyncio.capture_call_graph(task).call_stack, ())
self.assertIn(f"name={task.get_name()!r}", buf.getvalue())

async def test_capture_call_graph_generator_keeps_caller_frames(self):
# gh-156988: sync gen should not clear the call chain
stack = None

def gen():
nonlocal stack
graph = asyncio.capture_call_graph()
stack = [entry.frame.f_code.co_name for entry in graph.call_stack]
yield

def middle():
for _ in gen():
pass

async def main():
middle()

await main()
self.assertEqual(stack[:3], ['gen', 'middle', 'main'])


@unittest.skipIf(
not hasattr(asyncio.futures, "_c_future_add_to_awaited_by"),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
:func:`asyncio.print_call_graph` no longer truncates the call stack at a
synchronous generator.
Loading