diff options
author | Serhiy Storchaka <storchaka@gmail.com> | 2013-04-06 19:55:12 (GMT) |
---|---|---|
committer | Serhiy Storchaka <storchaka@gmail.com> | 2013-04-06 19:55:12 (GMT) |
commit | ee57f159afcba5aeca24a064a114ab441419a820 (patch) | |
tree | e950a43a52d0e87bbaad971078fabdb036c21041 /Objects/abstract.c | |
parent | 710b5f0b2452accf3495556b8bdc614699e6f544 (diff) | |
parent | 278d03bd66e40d57168ff66c6fb79eae599a784d (diff) | |
download | cpython-ee57f159afcba5aeca24a064a114ab441419a820.zip cpython-ee57f159afcba5aeca24a064a114ab441419a820.tar.gz cpython-ee57f159afcba5aeca24a064a114ab441419a820.tar.bz2 |
Revert a premature patch for issue #14010 (changeset 846bd418aee5).
Diffstat (limited to 'Objects/abstract.c')
-rw-r--r-- | Objects/abstract.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Objects/abstract.c b/Objects/abstract.c index 9b31d7a..4326cfa 100644 --- a/Objects/abstract.c +++ b/Objects/abstract.c @@ -1238,7 +1238,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) @@ -1257,7 +1257,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; } @@ -2702,10 +2702,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)) |