summaryrefslogtreecommitdiffstats
path: root/Objects/abstract.c
diff options
context:
space:
mode:
authorAmaury Forgeot d'Arc <amauryfa@gmail.com>2009-01-12 23:58:21 (GMT)
committerAmaury Forgeot d'Arc <amauryfa@gmail.com>2009-01-12 23:58:21 (GMT)
commitf343e01c170b3f63eafac4568d905be91b676254 (patch)
tree1c3aa5615718e7ccc70be59a5fbd72b7497869ae /Objects/abstract.c
parente5e298f8755c475e78f8cfc71ee0ea03c6674406 (diff)
downloadcpython-f343e01c170b3f63eafac4568d905be91b676254.zip
cpython-f343e01c170b3f63eafac4568d905be91b676254.tar.gz
cpython-f343e01c170b3f63eafac4568d905be91b676254.tar.bz2
Merged revisions 68560 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r68560 | amaury.forgeotdarc | 2009-01-13 00:36:55 +0100 (mar., 13 janv. 2009) | 6 lines #3720: Interpreter crashes when an evil iterator removes its own next function. Now the slot is filled with a function that always raises. Will not backport: extensions compiled with 2.6.x would not run on 2.6.0. ........
Diffstat (limited to 'Objects/abstract.c')
-rw-r--r--Objects/abstract.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/Objects/abstract.c b/Objects/abstract.c
index 0a0333c..1f988ec 100644
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -2736,7 +2736,6 @@ PyObject *
PyIter_Next(PyObject *iter)
{
PyObject *result;
- assert(PyIter_Check(iter));
result = (*iter->ob_type->tp_iternext)(iter);
if (result == NULL &&
PyErr_Occurred() &&