From cf0bcd1ab8753fc519475e6995da5fdd86cb300d Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Tue, 27 Jul 2010 22:09:59 +0000 Subject: [PATCH] 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. ........ --- Misc/ACKS | 1 + Objects/object.c | 15 ++------------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/Misc/ACKS b/Misc/ACKS index d25eb3a04f6..a9f7885b299 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -454,6 +454,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 b2a549252a8..57ed6eb698f 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)