Skip to content

Update types from v3.14.2 #6833

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
youknowone merged 6 commits into from
Jan 23, 2026
Merged

Update types from v3.14.2 #6833

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
16e26de
Update types from v3.14.2
moreal Jan 22, 2026
6b98862
Add CO_ITERABLE_COROUTINE flag and fix types tests
moreal Jan 22, 2026
be354cd
Handle CO_ITERABLE_COROUTINE flag in GetAwaitable instruction
moreal Jan 22, 2026
ae3a2eb
Handle CO_ITERABLE_COROUTINE flag in anext_awaitable
moreal Jan 22, 2026
b76dde1
Try __await__ method for generator subclasses in anext_awaitable
moreal Jan 22, 2026
0be2f40
apply review
youknowone Jan 23, 2026
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
Handle CO_ITERABLE_COROUTINE flag in anext_awaitable 
Generators decorated with @types.coroutine have the CO_ITERABLE_COROUTINE
flag and can be used in await expressions. The PyAnextAwaitable's
get_awaitable_iter method was missing this check, causing builtin anext()
to fail with "object generator can't be used in 'await' expression" when
used with such generators.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
  • Loading branch information
@moreal @claude
moreal and claude committed Jan 22, 2026
commit ae3a2eb8961e8197bf5bc1d923e5993772843ff6
20 changes: 19 additions & 1 deletion crates/vm/src/builtins/asyncgenerator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use super::{PyCode, PyGenericAlias, PyStrRef, PyType, PyTypeRef};
use super::{PyCode, PyGenerator, PyGenericAlias, PyStrRef, PyType, PyTypeRef};
use crate::{
AsObject, Context, Py, PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine,
builtins::PyBaseExceptionRef,
Expand Down Expand Up @@ -592,6 +592,24 @@ impl PyAnextAwaitable {
let awaitable = if wrapped.class().is(vm.ctx.types.coroutine_type) {
// Coroutine - get __await__ later
wrapped.clone()
} else if let Some(generator) = wrapped.downcast_ref::<PyGenerator>() {
// Generator with CO_ITERABLE_COROUTINE flag can be awaited
// (e.g., generators decorated with @types.coroutine)
if generator
.as_coro()
.frame()
.code
.flags
.contains(crate::bytecode::CodeFlags::ITERABLE_COROUTINE)
{
// Return the generator itself as the iterator
return Ok(wrapped.clone());
} else {
return Err(vm.new_type_error(format!(
"object {} can't be used in 'await' expression",
wrapped.class().name()
)));
}
} else {
// Try to get __await__ method
if let Some(await_method) = vm.get_method(wrapped.clone(), identifier!(vm, __await__)) {
Expand Down