mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Issue #24528: Improve error message for awaits in comprehensions

Browse source
This commit is contained in:
Yury Selivanov 2015-06-30 12:49:04 -04:00
parent 4a01cab898
commit 9dec03571f
2 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/test/test_coroutines.py
View file

@ -106,6 +106,16 @@ class AsyncBadSyntaxTest(unittest.TestCase):
with self.assertRaisesRegex(SyntaxError, 'invalid syntax'): with self.assertRaisesRegex(SyntaxError, 'invalid syntax'):
import test.badsyntax_async9 import test.badsyntax_async9
def test_badsyntax_10(self):
ns = {}
for comp in {'(await a for a in b)',
'[await a for a in b]',
'{await a for a in b}',
'{await a: c for a in b}'}:
with self.assertRaisesRegex( SyntaxError, 'await.*in comprehen'):
exec('async def f():\n\t{}'.format(comp), ns, ns)
class TokenizerRegrTest(unittest.TestCase): class TokenizerRegrTest(unittest.TestCase):

5
Python/compile.c
View file

@ -3856,7 +3856,10 @@ compiler_visit_expr(struct compiler *c, expr_ty e)
if (c->u->u_ste->ste_type != FunctionBlock) if (c->u->u_ste->ste_type != FunctionBlock)
return compiler_error(c, "'await' outside function"); 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) if (c->u->u_scope_type != COMPILER_SCOPE_ASYNC_FUNCTION)
return compiler_error(c, "'await' outside async function"); return compiler_error(c, "'await' outside async function");