changeset:   94949:a3b889e9d3f3
parent:      94947:2545bfe0d273
parent:      94948:2b4a04c3681b
user:        Serhiy Storchaka <storchaka@gmail.com>
date:        Wed Mar 11 18:22:29 2015 +0200
files:       Lib/test/test_generators.py Misc/ACKS Misc/NEWS Python/compile.c
description:
Issue #23192: Fixed generator lambdas.  Patch by Bruno Cauet.


diff -r 2545bfe0d273 -r a3b889e9d3f3 Lib/test/test_generators.py
--- a/Lib/test/test_generators.py	Wed Mar 11 08:43:12 2015 -0700
+++ b/Lib/test/test_generators.py	Wed Mar 11 18:22:29 2015 +0200
@@ -49,6 +49,26 @@
         self.assertTrue(finalized)
         self.assertEqual(gc.garbage, old_garbage)
 
+    def test_lambda_generator(self):
+        # Issue #23192: Test that a lambda returning a generator behaves
+        # like the equivalent function
+        f = lambda: (yield 1)
+        def g(): return (yield 1)
+
+        # test 'yield from'
+        f2 = lambda: (yield from g())
+        def g2(): return (yield from g())
+
+        f3 = lambda: (yield from f())
+        def g3(): return (yield from f())
+
+        for gen_fun in (f, g, f2, g2, f3, g3):
+            gen = gen_fun()
+            self.assertEqual(next(gen), 1)
+            with self.assertRaises(StopIteration) as cm:
+                gen.send(2)
+            self.assertEqual(cm.exception.value, 2)
+
 
 class GeneratorTest(unittest.TestCase):
 
diff -r 2545bfe0d273 -r a3b889e9d3f3 Misc/NEWS
--- a/Misc/NEWS	Wed Mar 11 08:43:12 2015 -0700
+++ b/Misc/NEWS	Wed Mar 11 18:22:29 2015 +0200
@@ -10,6 +10,8 @@
 Core and Builtins
 -----------------
 
+- Issue #23192: Fixed generator lambdas.  Patch by Bruno Cauet.
+
 - Issue #23629: Fix the default __sizeof__ implementation for variable-sized
   objects.
 
diff -r 2545bfe0d273 -r a3b889e9d3f3 Python/compile.c
--- a/Python/compile.c	Wed Mar 11 08:43:12 2015 -0700
+++ b/Python/compile.c	Wed Mar 11 18:22:29 2015 +0200
@@ -1897,12 +1897,12 @@
     c->u->u_kwonlyargcount = asdl_seq_LEN(args->kwonlyargs);
     VISIT_IN_SCOPE(c, expr, e->v.Lambda.body);
     if (c->u->u_ste->ste_generator) {
-        ADDOP_IN_SCOPE(c, POP_TOP);
+        co = assemble(c, 0);
     }
     else {
         ADDOP_IN_SCOPE(c, RETURN_VALUE);
+        co = assemble(c, 1);
     }
-    co = assemble(c, 1);
     qualname = c->u->u_qualname;
     Py_INCREF(qualname);
     compiler_exit_scope(c);