Author: guido.van.rossum
Date: Tue Aug 7 21:58:47 2007
New Revision: 56805
Modified:
python/branches/py3k-struni/Modules/_collectionsmodule.c
python/branches/py3k-struni/Modules/_sqlite/row.c
python/branches/py3k-struni/PC/_winreg.c
Log:
Kill remaining tp_print definitions.
Modified: python/branches/py3k-struni/Modules/_collectionsmodule.c
==============================================================================
--- python/branches/py3k-struni/Modules/_collectionsmodule.c (original)
+++ python/branches/py3k-struni/Modules/_collectionsmodule.c Tue Aug 7
21:58:47 2007
@@ -633,46 +633,6 @@
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 @@
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 @@
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 @@
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 */
Modified: python/branches/py3k-struni/Modules/_sqlite/row.c
==============================================================================
--- python/branches/py3k-struni/Modules/_sqlite/row.c (original)
+++ python/branches/py3k-struni/Modules/_sqlite/row.c Tue Aug 7 21:58:47 2007
@@ -159,11 +159,6 @@
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 @@
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 */
Modified: python/branches/py3k-struni/PC/_winreg.c
==============================================================================
--- python/branches/py3k-struni/PC/_winreg.c (original)
+++ python/branches/py3k-struni/PC/_winreg.c Tue Aug 7 21:58:47 2007
@@ -387,17 +387,6 @@
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 @@
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 */
_______________________________________________
Python-3000-checkins mailing list
[email protected]
http://mail.python.org/mailman/listinfo/python-3000-checkins
