diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2020-07-06 21:44:16 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-06 21:44:16 (GMT) |
| commit | 41db8ffc59566b8552f9cce4452ee8afad00aa63 (patch) | |
| tree | b6f575f4b24c370e5bdf816c8f25170db2668a4b /Python | |
| parent | aa7f7756149a10c64d01f583b71e91814db886ab (diff) | |
| download | cpython-41db8ffc59566b8552f9cce4452ee8afad00aa63.zip cpython-41db8ffc59566b8552f9cce4452ee8afad00aa63.tar.gz cpython-41db8ffc59566b8552f9cce4452ee8afad00aa63.tar.bz2 | |
bpo-41218: Only mark async code with CO_COROUTINE. (GH-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.
(cherry picked from commit bd46174a5a09a54e5ae1077909f923f56a7cf710)
Co-authored-by: Matthias Bussonnier <bussonniermatthias@gmail.com>
Diffstat (limited to 'Python')
| -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 913ec99..3259e8a 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -4470,10 +4470,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); @@ -4485,7 +4484,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; @@ -4524,6 +4523,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; |