fix yield from return value on custom iterators (closes #15568)

benjaminp · benjaminp · commit b37df519c793 · 2012-08-06T17:53:09.000-07:00
diff --git a/Lib/test/test_pep380.py b/Lib/test/test_pep380.py
@@ -940,6 +940,20 @@ def eggs(g):
         for stack in spam(eggs(gen())):
             self.assertTrue('spam' in stack and 'eggs' in stack)
 
+    def test_custom_iterator_return(self):
+        # See issue #15568
+        class MyIter:
+            def __iter__(self):
+                return self
+            def __next__(self):
+                raise StopIteration(42)
+        def gen():
+            nonlocal ret
+            ret = yield from MyIter()
+        ret = None
+        list(gen())
+        self.assertEqual(ret, 42)
+
 
 def test_main():
     from test import support
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -10,6 +10,9 @@ What's New in Python 3.3.0 Beta 2?
 Core and Builtins
 -----------------
 
+- Issue #15568: Fix the return value of "yield from" when StopIteration is
+  raised by a custom iterator.
+
 - Issue #13119: sys.stdout and sys.stderr are now using "\r\n" newline on
   Windows, as Python 2.
 
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -1843,7 +1843,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
             } else {
                 _Py_IDENTIFIER(send);
                 if (u == Py_None)
-                    retval = PyIter_Next(x);
+                    retval = Py_TYPE(x)->tp_iternext(x);
                 else
                     retval = _PyObject_CallMethodId(x, &PyId_send, "O", u);
             }

Original file line number	Diff line number	Diff line change
`@@ -1843,7 +1843,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)`
`1843`	`1843`	`} else {`
`1844`	`1844`	`_Py_IDENTIFIER(send);`
`1845`	`1845`	`if (u == Py_None)`
`1846`		`- retval = PyIter_Next(x);`
	`1846`	`+ retval = Py_TYPE(x)->tp_iternext(x);`
`1847`	`1847`	`else`
`1848`	`1848`	`retval = _PyObject_CallMethodId(x, &PyId_send, "O", u);`
`1849`	`1849`	`}`