diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-07-27 22:08:27 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-07-27 22:08:27 (GMT) |
| commit | c47bd4a09a6702a08e5fb15d1d8ab3478393aba9 (patch) | |
| tree | 85fcbf5919c8433850b145bad8bc35eb5085b835 | |
| parent | 63c46403279fcb6a9cae43c475fd2c58e1303b0b (diff) | |
| download | cpython-c47bd4a09a6702a08e5fb15d1d8ab3478393aba9.zip cpython-c47bd4a09a6702a08e5fb15d1d8ab3478393aba9.tar.gz cpython-c47bd4a09a6702a08e5fb15d1d8ab3478393aba9.tar.bz2 | |
Issue #9294: remove dead code in Objects/object.c. Patch by Grant Limberg.
| -rw-r--r-- | Misc/ACKS | 1 | ||||
| -rw-r--r-- | Objects/object.c | 15 |
2 files changed, 3 insertions, 13 deletions
@@ -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 76d018f..ef23ac1 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) |