https://github.com/python/cpython/commit/a93a663d6c2fdfbddbda9729c96e2737c00... commit: a93a663d6c2fdfbddbda9729c96e2737c0012522 branch: 3.7 author: Zsolt Dollenstein <zsol.zsol@gmail.com> committer: Yury Selivanov <yury@magic.io> date: 2018-04-27T18:33:37-04:00 summary: [3.7] bpo-33363: raise SyntaxError for async for/with outside async functions (GH-6616). (GH-6619) files: A Misc/NEWS.d/next/Core and Builtins/2018-04-26-22-48-28.bpo-33363.8RCnN2.rst M Lib/test/test_coroutines.py M Python/compile.c diff --git a/Lib/test/test_coroutines.py b/Lib/test/test_coroutines.py index ea54bca0df0d..ac24f3976738 100644 --- a/Lib/test/test_coroutines.py +++ b/Lib/test/test_coroutines.py @@ -362,7 +362,22 @@ def bar(): """def foo(): async def bar(): 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: with self.subTest(code=code), self.assertRaises(SyntaxError): diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-04-26-22-48-28.bpo-33363.8RCnN2.rst b/Misc/NEWS.d/next/Core and Builtins/2018-04-26-22-48-28.bpo-33363.8RCnN2.rst new file mode 100644 index 000000000000..ad8d24895343 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2018-04-26-22-48-28.bpo-33363.8RCnN2.rst @@ -0,0 +1,2 @@ +Raise a SyntaxError for ``async with`` and ``async for`` statements outside +of async functions. diff --git a/Python/compile.c b/Python/compile.c index d4245e2f4e50..62d78867e077 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -2339,6 +2339,10 @@ compiler_async_for(struct compiler *c, stmt_ty s) basicblock *try, *except, *end, *after_try, *try_cleanup, *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); if (stop_aiter_error == NULL) { 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); 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); finally = compiler_new_block(c);