Issue #24619: More tests; fix nits in compiler.c

1st1 · 1st1 · commit b7666a30933e · 2015-07-22T14:48:57.000+03:00
diff --git a/Lib/test/badsyntax_async2.py b/Lib/test/badsyntax_async2.py
@@ -1,2 +1,2 @@
-async def foo(a:await something()):
+async def foo(a=await something()):
     pass
diff --git a/Lib/test/test_coroutines.py b/Lib/test/test_coroutines.py
@@ -205,12 +205,14 @@ def bar():
                    return lambda a: await
             """,
 
-            """async def foo(a: await b):
+            """await a()""",
+
+            """async def foo(a=await b):
                    pass
             """,
 
             """def baz():
-                   async def foo(a: await b):
+                   async def foo(a=await b):
                        pass
             """,
 
@@ -271,10 +273,9 @@ async def bar():
                         pass\nawait a
             """]
 
-        ns = {}
         for code in samples:
             with self.subTest(code=code), self.assertRaises(SyntaxError):
-                exec(code, ns, ns)
+                compile(code, "<test>", "exec")
 
     def test_goodsyntax_1(self):
         # Tests for issue 24619
diff --git a/Python/compile.c b/Python/compile.c
@@ -1749,13 +1749,12 @@ compiler_function(struct compiler *c, stmt_ty s, int is_async)
     arglength = asdl_seq_LEN(args->defaults);
     arglength |= kw_default_count << 8;
     arglength |= num_annotations << 16;
+    if (is_async)
+        co->co_flags |= CO_COROUTINE;
     compiler_make_closure(c, co, arglength, qualname);
     Py_DECREF(qualname);
     Py_DECREF(co);
 
-    if (is_async)
-        co->co_flags |= CO_COROUTINE;
-
     /* decorators */
     for (i = 0; i < asdl_seq_LEN(decos); i++) {
         ADDOP_I(c, CALL_FUNCTION, 1);
diff --git a/Python/symtable.c b/Python/symtable.c
@@ -1542,7 +1542,7 @@ symtable_visit_annotations(struct symtable *st, stmt_ty s,
     if (a->kwonlyargs && !symtable_visit_argannotations(st, a->kwonlyargs))
         return 0;
     if (returns)
-        VISIT(st, expr, s->v.FunctionDef.returns);
+        VISIT(st, expr, returns);
     return 1;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-async def foo(a:await something()):`
	`1`	`+async def foo(a=await something()):`
`2`	`2`	`pass`
Original file line number	Diff line number	Diff line change
`@@ -1542,7 +1542,7 @@ symtable_visit_annotations(struct symtable *st, stmt_ty s,`
`1542`	`1542`	`if (a->kwonlyargs && !symtable_visit_argannotations(st, a->kwonlyargs))`
`1543`	`1543`	`return 0;`
`1544`	`1544`	`if (returns)`
`1545`		`- VISIT(st, expr, s->v.FunctionDef.returns);`
	`1545`	`+ VISIT(st, expr, returns);`
`1546`	`1546`	`return 1;`
`1547`	`1547`	`}`
`1548`	`1548`