diff options
| -rw-r--r-- | Modules/_collectionsmodule.c | 60 | ||||
| -rw-r--r-- | Modules/_sqlite/row.c | 7 | ||||
| -rw-r--r-- | PC/_winreg.c | 13 |
3 files changed, 4 insertions, 76 deletions
diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c index 1ee3612..815b6e8 100644 --- a/Modules/_collectionsmodule.c +++ b/Modules/_collectionsmodule.c @@ -633,46 +633,6 @@ deque_repr(PyObject *deque) return result; } -static int -deque_tp_print(PyObject *deque, FILE *fp, int flags) -{ - PyObject *it, *item; - char *emit = ""; /* No separator emitted on first pass */ - char *separator = ", "; - int i; - - i = Py_ReprEnter(deque); - if (i != 0) { - if (i < 0) - return i; - fputs("[...]", fp); - return 0; - } - - it = PyObject_GetIter(deque); - if (it == NULL) - return -1; - - fputs("deque([", fp); - while ((item = PyIter_Next(it)) != NULL) { - fputs(emit, fp); - emit = separator; - if (PyObject_Print(item, fp, 0) != 0) { - Py_DECREF(item); - Py_DECREF(it); - Py_ReprLeave(deque); - return -1; - } - Py_DECREF(item); - } - Py_ReprLeave(deque); - Py_DECREF(it); - if (PyErr_Occurred()) - return -1; - fputs("])", fp); - return 0; -} - static PyObject * deque_richcompare(PyObject *v, PyObject *w, int op) { @@ -824,7 +784,7 @@ static PyTypeObject deque_type = { 0, /* tp_itemsize */ /* methods */ (destructor)deque_dealloc, /* tp_dealloc */ - deque_tp_print, /* tp_print */ + 0, /* tp_print */ 0, /* tp_getattr */ 0, /* tp_setattr */ 0, /* tp_compare */ @@ -1179,22 +1139,6 @@ defdict_dealloc(defdictobject *dd) PyDict_Type.tp_dealloc((PyObject *)dd); } -static int -defdict_print(defdictobject *dd, FILE *fp, int flags) -{ - int sts; - fprintf(fp, "defaultdict("); - if (dd->default_factory == NULL) - fprintf(fp, "None"); - else { - PyObject_Print(dd->default_factory, fp, 0); - } - fprintf(fp, ", "); - sts = PyDict_Type.tp_print((PyObject *)dd, fp, 0); - fprintf(fp, ")"); - return sts; -} - static PyObject * defdict_repr(defdictobject *dd) { @@ -1277,7 +1221,7 @@ static PyTypeObject defdict_type = { 0, /* tp_itemsize */ /* methods */ (destructor)defdict_dealloc, /* tp_dealloc */ - (printfunc)defdict_print, /* tp_print */ + 0, /* tp_print */ 0, /* tp_getattr */ 0, /* tp_setattr */ 0, /* tp_compare */ diff --git a/Modules/_sqlite/row.c b/Modules/_sqlite/row.c index 9ada8a9..6bd1887 100644 --- a/Modules/_sqlite/row.c +++ b/Modules/_sqlite/row.c @@ -159,11 +159,6 @@ PyObject* pysqlite_row_keys(pysqlite_Row* self, PyObject* args, PyObject* kwargs return list; } -static int pysqlite_row_print(pysqlite_Row* self, FILE *fp, int flags) -{ - return (&PyTuple_Type)->tp_print(self->data, fp, flags); -} - static PyObject* pysqlite_iter(pysqlite_Row* self) { return PyObject_GetIter(self->data); @@ -188,7 +183,7 @@ PyTypeObject pysqlite_RowType = { sizeof(pysqlite_Row), /* tp_basicsize */ 0, /* tp_itemsize */ (destructor)pysqlite_row_dealloc, /* tp_dealloc */ - (printfunc)pysqlite_row_print, /* tp_print */ + 0, /* tp_print */ 0, /* tp_getattr */ 0, /* tp_setattr */ 0, /* tp_compare */ diff --git a/PC/_winreg.c b/PC/_winreg.c index ecb723c..c294653 100644 --- a/PC/_winreg.c +++ b/PC/_winreg.c @@ -387,17 +387,6 @@ PyHKEY_intFunc(PyObject *ob) return PyLong_FromVoidPtr(pyhkey->hkey); } -static int -PyHKEY_printFunc(PyObject *ob, FILE *fp, int flags) -{ - PyHKEYObject *pyhkey = (PyHKEYObject *)ob; - char resBuf[160]; - wsprintf(resBuf, "<PyHKEY at %p (%p)>", - ob, pyhkey->hkey); - fputs(resBuf, fp); - return 0; -} - static PyObject * PyHKEY_strFunc(PyObject *ob) { @@ -464,7 +453,7 @@ PyTypeObject PyHKEY_Type = sizeof(PyHKEYObject), 0, PyHKEY_deallocFunc, /* tp_dealloc */ - PyHKEY_printFunc, /* tp_print */ + 0, /* tp_print */ PyHKEY_getattr, /* tp_getattr */ 0, /* tp_setattr */ PyHKEY_compareFunc, /* tp_compare */ |