From: Antoine Pitrou <solipsis@pitrou.net>
Date: Tue, 27 Jul 2010 22:08:27 +0000 (+0000)
Subject: Issue #9294: remove dead code in Objects/object.c.  Patch by Grant Limberg.
X-Git-Tag: v3.2a1~88
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c47bd4a09a6702a08e5fb15d1d8ab3478393aba9;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Misc/ACKS b/Misc/ACKS
index adbf9c1fa51c..57065ac64d7d 100644
--- 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 76d018f7f139..ef23ac194a11 100644
--- 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)