Issue #9294: remove dead code in Objects/object.c. Patch by Grant Limberg.

diff --git a/Misc/ACKS b/Misc/ACKS
index adbf9c1fa51c9b660e0e1ad4ec07992301bfe771..57065ac64d7d1952af99e75140464d13080d31f0 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -479,6 +479,7 @@ Robert van Liere
 Ross Light
 Shawn Ligocki
 Martin Ligr
+Grant Limberg
 Christopher Lindblad
 Bjorn Lindqvist
 Per Lindqvist

diff --git a/Objects/object.c b/Objects/object.c
index 76d018f7f1392fc7e9908349018e687ba41ea752..ef23ac194a116c9be6d9d21d3f3390271730d20b 100644 (file)
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -258,15 +258,10 @@ _PyObject_NewVar(PyTypeObject *tp, Py_ssize_t nitems)
     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 @@ internal_print(PyObject *op, FILE *fp, int flags, int nesting)
     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)