diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-07-27 22:09:59 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-07-27 22:09:59 (GMT) |
| commit | cf0bcd1ab8753fc519475e6995da5fdd86cb300d (patch) | |
| tree | b78560edb4431d20530dbc0b3e6519b35b90226a /Objects | |
| parent | ec34d94fa62bf044f8c46a514781424e2a631972 (diff) | |
| download | cpython-cf0bcd1ab8753fc519475e6995da5fdd86cb300d.zip cpython-cf0bcd1ab8753fc519475e6995da5fdd86cb300d.tar.gz cpython-cf0bcd1ab8753fc519475e6995da5fdd86cb300d.tar.bz2 | |
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.
........
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/object.c | 15 |
1 files changed, 2 insertions, 13 deletions
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 @@ _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) |