diff options
author | Matthias Bussonnier <bussonniermatthias@gmail.com> | 2020-07-06 21:26:52 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-06 21:26:52 (GMT) |
commit | bd46174a5a09a54e5ae1077909f923f56a7cf710 (patch) | |
tree | 0b217ac0c8f01eb1789acc9d7ab23848ab7d0b5e /Python/compile.c | |
parent | a103e73ce8d34e3af5f556ee9090ce89249d565e (diff) | |
download | cpython-bd46174a5a09a54e5ae1077909f923f56a7cf710.zip cpython-bd46174a5a09a54e5ae1077909f923f56a7cf710.tar.gz cpython-bd46174a5a09a54e5ae1077909f923f56a7cf710.tar.bz2 |
bpo-41218: Only mark async code with CO_COROUTINE. (#21357)
3.8.3 had a regression where compiling with
ast.PyCF_ALLOW_TOP_LEVEL_AWAIT woudl agressively mark things are
coroutine even if there were not.
Diffstat (limited to 'Python/compile.c')
-rw-r--r-- | Python/compile.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Python/compile.c b/Python/compile.c index 4a9b511..1b94f06 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -4588,10 +4588,9 @@ compiler_comprehension(struct compiler *c, expr_ty e, int type, comprehension_ty outermost; PyObject *qualname = NULL; int is_async_generator = 0; + int top_level_await = IS_TOP_LEVEL_AWAIT(c); + - if (IS_TOP_LEVEL_AWAIT(c)) { - c->u->u_ste->ste_coroutine = 1; - } int is_async_function = c->u->u_ste->ste_coroutine; outermost = (comprehension_ty) asdl_seq_GET(generators, 0); @@ -4603,7 +4602,7 @@ compiler_comprehension(struct compiler *c, expr_ty e, int type, is_async_generator = c->u->u_ste->ste_coroutine; - if (is_async_generator && !is_async_function && type != COMP_GENEXP) { + if (is_async_generator && !is_async_function && type != COMP_GENEXP && !top_level_await) { compiler_error(c, "asynchronous comprehension outside of " "an asynchronous function"); goto error_in_scope; @@ -4642,6 +4641,9 @@ compiler_comprehension(struct compiler *c, expr_ty e, int type, qualname = c->u->u_qualname; Py_INCREF(qualname); compiler_exit_scope(c); + if (top_level_await && is_async_generator){ + c->u->u_ste->ste_coroutine = 1; + } if (co == NULL) goto error; |