From c775ad615a6370ec8424422422bbec3f0976428b Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Wed, 11 Mar 2015 18:20:35 +0200
Subject: Issue #23192: Fixed generator lambdas.  Patch by Bruno Cauet.

---
 Lib/test/test_generators.py | 20 ++++++++++++++++++++
 Misc/ACKS                   |  1 +
 Misc/NEWS                   |  2 ++
 Python/compile.c            |  4 ++--
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/Lib/test/test_generators.py b/Lib/test/test_generators.py
index 7825a77..5c455cd 100644
--- a/Lib/test/test_generators.py
+++ b/Lib/test/test_generators.py
@@ -49,6 +49,26 @@ class FinalizationTest(unittest.TestCase):
         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 ExceptionTest(unittest.TestCase):
     # Tests for the issue #23353: check that the currently handled exception
diff --git a/Misc/ACKS b/Misc/ACKS
index 20598ab..cf25d6f 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -216,6 +216,7 @@ Pierre Carrier
 Terry Carroll
 Edward Catmur
 Lorenzo M. Catucci
+Bruno Cauet
 Donn Cave
 Charles Cazabon
 Jesús Cea Avión
diff --git a/Misc/NEWS b/Misc/NEWS
index a6073b8..2d69b76 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,8 @@ Release date: tba
 Core and Builtins
 -----------------
 
+- Issue #23192: Fixed generator lambdas.  Patch by Bruno Cauet.
+
 - Issue #23629: Fix the default __sizeof__ implementation for variable-sized
   objects.
 
diff --git a/Python/compile.c b/Python/compile.c
index b07c156..3d7152c 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -1897,12 +1897,12 @@ compiler_lambda(struct compiler *c, expr_ty e)
     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);
-- 
cgit v0.12