Merge 3.5 (Issue #24528)

This commit is contained in:
Yury Selivanov 2015-06-30 12:49:18 -04:00
commit 3bd2b98c29
2 changed files with 14 additions and 1 deletions

View file

@ -3856,7 +3856,10 @@ compiler_visit_expr(struct compiler *c, expr_ty e)
if (c->u->u_ste->ste_type != FunctionBlock)
return compiler_error(c, "'await' outside function");
/* this check won't be triggered while we have AWAIT token */
if (c->u->u_scope_type == COMPILER_SCOPE_COMPREHENSION)
return compiler_error(
c, "'await' expressions in comprehensions are not supported");
if (c->u->u_scope_type != COMPILER_SCOPE_ASYNC_FUNCTION)
return compiler_error(c, "'await' outside async function");