8000 GH-128534: Fix behavior of branch monitoring for `async for` by markshannon · Pull Request #130847 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

GH-128534: Fix behavior of branch monitoring for async for #130847

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Mar 7, 2025
Merged

GH-128534: Fix behavior of branch monitoring for async for #130847

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e6a91ae
Fix branch monitoring for . Both branches in a pair now have a common…
markshannon Mar 4, 2025
f8eb10a
Bump magic and add news
markshannon Mar 4, 2025
4c50ef3
Tidy up debug code
markshannon Mar 4, 2025
2899103
Fixup tests
markshannon Mar 4, 2025
4c20ae6
Merge branch 'main' into co-branch-async-for
markshannon Mar 4, 2025
e7f0db3
Fix up dis to understand oparg of END_ASYNC_FOR
markshannon Mar 4, 2025
d2996f2
Fix typo
markshannon Mar 4, 2025
7d3dafa
Clarifications
markshannon Mar 6, 2025
b3cae50
Merge branch 'main' into co-branch-async-for
markshannon Mar 6, 2025
15bf47b
Assert that END_SEND is the source of the branch event for async for
markshannon Mar 7, 2025
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
Prev Previous commit
Next Next commit
Bump magic and add news
  • Loading branch information
@markshannon
markshannon committed Mar 4, 2025
commit f8eb10a2160ebd847da76c051e2232e821387a97
3 changes: 2 additions & 1 deletion Include/internal/pycore_magic_number.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,7 @@ Known values:
Python 3.14a5 3615 (CALL_FUNCTION_EX always take a kwargs argument)
Python 3.14a5 3616 (Remove BINARY_SUBSCR and family. Make them BINARY_OPs)
Python 3.14a6 3617 (Branch monitoring for async for loops)
Python 3.14a6 3618 (Add oparg to END_ASYNC_FOR)

Python 3.15 will start with 3650

Expand All @@ -282,7 +283,7 @@ PC/launcher.c must also be updated.

*/

#define PYC_MAGIC_NUMBER 3617
#define PYC_MAGIC_NUMBER 3618
/* This is equivalent to converting PYC_MAGIC_NUMBER to 2 bytes
(little-endian) and then appending b'\r\n'. */
#define PYC_MAGIC_NUMBER_TOKEN \
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Core_and_Builtins/2025-03-04-15-12-32.gh-issue-128534.3A0K3D.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Ensure that both and left branches have same source for ``async for`` loops.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

grammar

Add these branches to the ``co_branches()`` iterator.
0