NULL and no exception set from tp_iternext means StopIteration
diff --git a/Lib/test/test_pep380.py b/Lib/test/test_pep380.py
index 53e9735..6554b0f 100644
--- a/Lib/test/test_pep380.py
+++ b/Lib/test/test_pep380.py
@@ -831,6 +831,11 @@
"Enter f",
])
+ def test_yield_from_empty(self):
+ def g():
+ yield from ()
+ self.assertRaises(StopIteration, next, g())
+
def test_main():
from test import support
diff --git a/Python/ceval.c b/Python/ceval.c
index 134d1ee..98219b0 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -1839,7 +1839,8 @@
if (!retval) {
/* iter may be exhausted */
Py_CLEAR(x);
- if (!PyErr_ExceptionMatches(PyExc_StopIteration)) {
+ if (PyErr_Occurred() &&
+ !PyErr_ExceptionMatches(PyExc_StopIteration)) {
/* some other exception */
break;
}