changeset:   96997:6f4e0c462daf
parent:      96995:987b72921a0c
parent:      96996:e4e01488afff
user:        Yury Selivanov <yselivanov@sprymix.com>
date:        Wed Jul 22 14:49:13 2015 +0300
files:       Python/compile.c
description:
Merge 3.5 (Issue #24619)


diff -r 987b72921a0c -r 6f4e0c462daf Lib/test/badsyntax_async2.py
--- a/Lib/test/badsyntax_async2.py	Wed Jul 22 13:38:18 2015 +0300
+++ b/Lib/test/badsyntax_async2.py	Wed Jul 22 14:49:13 2015 +0300
@@ -1,2 +1,2 @@
-async def foo(a:await something()):
+async def foo(a=await something()):
     pass
diff -r 987b72921a0c -r 6f4e0c462daf Lib/test/test_coroutines.py
--- a/Lib/test/test_coroutines.py	Wed Jul 22 13:38:18 2015 +0300
+++ b/Lib/test/test_coroutines.py	Wed Jul 22 14:49:13 2015 +0300
@@ -205,12 +205,14 @@
                    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 @@
                         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 -r 987b72921a0c -r 6f4e0c462daf Python/compile.c
--- a/Python/compile.c	Wed Jul 22 13:38:18 2015 +0300
+++ b/Python/compile.c	Wed Jul 22 14:49:13 2015 +0300
@@ -1749,13 +1749,12 @@
     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 -r 987b72921a0c -r 6f4e0c462daf Python/symtable.c
--- a/Python/symtable.c	Wed Jul 22 13:38:18 2015 +0300
+++ b/Python/symtable.c	Wed Jul 22 14:49:13 2015 +0300
@@ -1542,7 +1542,7 @@
     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;
 }