[3.7] bpo-33363: raise SyntaxError for async for/with outside async functions (GH-6616). (GH-6619)

This commit is contained in:
Zsolt Dollenstein 2018-04-27 15:33:37 -07:00 committed by Yury Selivanov
parent dd3ede7537
commit a93a663d6c
3 changed files with 25 additions and 1 deletions

View file

@ -362,7 +362,22 @@ class AsyncBadSyntaxTest(unittest.TestCase):
"""def foo(): """def foo():
async def bar(): async def bar():
pass\nawait a pass\nawait a
"""] """,
"""def foo():
async for i in arange(2):
pass
""",
"""def foo():
async with resource:
pass
""",
"""async with resource:
pass
""",
"""async for i in arange(2):
pass
""",
]
for code in samples: for code in samples:
with self.subTest(code=code), self.assertRaises(SyntaxError): with self.subTest(code=code), self.assertRaises(SyntaxError):

View file

@ -0,0 +1,2 @@
Raise a SyntaxError for ``async with`` and ``async for`` statements outside
of async functions.

View file

@ -2339,6 +2339,10 @@ compiler_async_for(struct compiler *c, stmt_ty s)
basicblock *try, *except, *end, *after_try, *try_cleanup, basicblock *try, *except, *end, *after_try, *try_cleanup,
*after_loop_else; *after_loop_else;
if (c->u->u_scope_type != COMPILER_SCOPE_ASYNC_FUNCTION) {
return compiler_error(c, "'async for' outside async function");
}
PyObject *stop_aiter_error = _PyUnicode_FromId(&PyId_StopAsyncIteration); PyObject *stop_aiter_error = _PyUnicode_FromId(&PyId_StopAsyncIteration);
if (stop_aiter_error == NULL) { if (stop_aiter_error == NULL) {
return 0; return 0;
@ -4204,6 +4208,9 @@ compiler_async_with(struct compiler *c, stmt_ty s, int pos)
withitem_ty item = asdl_seq_GET(s->v.AsyncWith.items, pos); withitem_ty item = asdl_seq_GET(s->v.AsyncWith.items, pos);
assert(s->kind == AsyncWith_kind); assert(s->kind == AsyncWith_kind);
if (c->u->u_scope_type != COMPILER_SCOPE_ASYNC_FUNCTION) {
return compiler_error(c, "'async with' outside async function");
}
block = compiler_new_block(c); block = compiler_new_block(c);
finally = compiler_new_block(c); finally = compiler_new_block(c);