Merged revisions 83184 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r83184 | antoine.pitrou | 2010-07-28 00:08:27 +0200 (mer., 28 juil. 2010) | 3 lines
Issue #9294: remove dead code in Objects/object.c. Patch by Grant Limberg.
........
diff --git a/Objects/object.c b/Objects/object.c
index b2a5492..57ed6eb 100644
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -258,15 +258,10 @@
return PyObject_INIT_VAR(op, tp, nitems);
}
-/* Implementation of PyObject_Print with recursion checking */
-static int
-internal_print(PyObject *op, FILE *fp, int flags, int nesting)
+int
+PyObject_Print(PyObject *op, FILE *fp, int flags)
{
int ret = 0;
- if (nesting > 10) {
- PyErr_SetString(PyExc_RuntimeError, "print recursion");
- return -1;
- }
if (PyErr_CheckSignals())
return -1;
#ifdef USE_STACKCHECK
@@ -333,12 +328,6 @@
return ret;
}
-int
-PyObject_Print(PyObject *op, FILE *fp, int flags)
-{
- return internal_print(op, fp, flags, 0);
-}
-
/* For debugging convenience. Set a breakpoint here and call it from your DLL */
void
_Py_BreakPoint(void)