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. ........
This commit is contained in:
parent
ec34d94fa6
commit
cf0bcd1ab8
|
@ -454,6 +454,7 @@ Robert van Liere
|
|||
Ross Light
|
||||
Shawn Ligocki
|
||||
Martin Ligr
|
||||
Grant Limberg
|
||||
Christopher Lindblad
|
||||
Bjorn Lindqvist
|
||||
Per Lindqvist
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue