summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2013-04-06 19:52:34 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2013-04-06 19:52:34 (GMT)
commit278d03bd66e40d57168ff66c6fb79eae599a784d (patch)
treef1d79e038b315e6596d3dce29e75ff602446f2b6 /Objects
parent9e64c91c922564a0510ec667dd38c11a7c1bd748 (diff)
downloadcpython-278d03bd66e40d57168ff66c6fb79eae599a784d.zip
cpython-278d03bd66e40d57168ff66c6fb79eae599a784d.tar.gz
cpython-278d03bd66e40d57168ff66c6fb79eae599a784d.tar.bz2
Revert a premature patch for issue #14010 (changeset aaaf36026511).
Diffstat (limited to 'Objects')
-rw-r--r--Objects/abstract.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/Objects/abstract.c b/Objects/abstract.c
index 77a16c9..a2737dd 100644
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -1217,7 +1217,7 @@ PyNumber_AsSsize_t(PyObject *item, PyObject *err)
to be an int or have an __int__ method. Steals integral's
reference. error_format will be used to create the TypeError if integral
isn't actually an Integral instance. error_format should be a format string
- that can accept a char* naming integral's type.
+ that can accept a char* naming integral's type.
*/
static PyObject *
convert_integral_to_int(PyObject *integral, const char *error_format)
@@ -1236,7 +1236,7 @@ convert_integral_to_int(PyObject *integral, const char *error_format)
}
PyErr_Format(PyExc_TypeError, error_format, Py_TYPE(integral)->tp_name);
Py_DECREF(integral);
- return NULL;
+ return NULL;
}
@@ -2681,10 +2681,7 @@ PyObject *
PyIter_Next(PyObject *iter)
{
PyObject *result;
- if (Py_EnterRecursiveCall(" while iterating"))
- return NULL;
result = (*iter->ob_type->tp_iternext)(iter);
- Py_LeaveRecursiveCall();
if (result == NULL &&
PyErr_Occurred() &&
PyErr_ExceptionMatches(PyExc_StopIteration))