commit 80d49b33b12d3726baff0b3b99307457167dd67b
author Raymond Hettinger <python@rcn.com> Sun Nov 01 08:53:21 2009 +0000
committer Raymond Hettinger <python@rcn.com> Sun Nov 01 08:53:21 2009 +0000
tree 0bc81ac5d040a7e3d8e57ff17562599b039750bb
parent e2670af08b4fd6dd2bb9b910e9399f9a184d7c82

Issue 7244: fix exception handling in itertools.izip_longest().

Modules/itertoolsmodule.c

diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c
index 5875d10..ecd5e17 100644
--- a/Modules/itertoolsmodule.c
+++ b/Modules/itertoolsmodule.c
@@ -3412,10 +3412,11 @@
                                 item = lz->fillvalue;
                         } else {
                                 assert(PyIter_Check(it));
-                                item = (*Py_TYPE(it)->tp_iternext)(it);
+                                item = PyIter_Next(it);
                                 if (item == NULL) {
-                                        lz->numactive -= 1;      
-                                        if (lz->numactive == 0) {
+                                        lz->numactive -= 1;
+                                        if (lz->numactive == 0 || PyErr_Occurred()) {
+												lz->numactive = 0;
                                                 Py_DECREF(result);
                                                 return NULL;
                                         } else {
@@ -3441,10 +3442,11 @@
                                 item = lz->fillvalue;
                         } else {
                                 assert(PyIter_Check(it));
-                                item = (*Py_TYPE(it)->tp_iternext)(it);
+                                item = PyIter_Next(it);
                                 if (item == NULL) {
                                         lz->numactive -= 1;      
-                                        if (lz->numactive == 0) {
+                                        if (lz->numactive == 0 || PyErr_Occurred()) {
+												lz->numactive = 0;
                                                 Py_DECREF(result);
                                                 return NULL;
                                         } else {