folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

All rpm-python iterators are self-iterators, just use PyObject_SelfIter

This commit is contained in:
Panu Matilainen 2009-09-22 20:20:07 +03:00
parent d7134660ca
commit 0793b2cf23
5 changed files with 5 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
python/rpmds-py.c
View File

@ -199,13 +199,6 @@ rpmds_richcompare(rpmdsObject * a, rpmdsObject * b, int op)
return Py_BuildValue("i", rc); return Py_BuildValue("i", rc);
} }
static PyObject *
rpmds_iter(rpmdsObject * s)
{
Py_INCREF(s);
return (PyObject *)s;
}
static PyObject * static PyObject *
rpmds_iternext(rpmdsObject * s) rpmds_iternext(rpmdsObject * s)
{ {
@ -548,7 +541,7 @@ PyTypeObject rpmds_Type = {
0, /* tp_clear */ 0, /* tp_clear */
(richcmpfunc) rpmds_richcompare,/* tp_richcompare */ (richcmpfunc) rpmds_richcompare,/* tp_richcompare */
0, /* tp_weaklistoffset */ 0, /* tp_weaklistoffset */
(getiterfunc) rpmds_iter, /* tp_iter */ PyObject_SelfIter, /* tp_iter */
(iternextfunc) rpmds_iternext, /* tp_iternext */ (iternextfunc) rpmds_iternext, /* tp_iternext */
rpmds_methods, /* tp_methods */ rpmds_methods, /* tp_methods */
0, /* tp_members */ 0, /* tp_members */

9
python/rpmfi-py.c
View File

@ -162,13 +162,6 @@ rpmfi_FClass(rpmfiObject * s)
return Py_BuildValue("s", xstrdup(FClass)); return Py_BuildValue("s", xstrdup(FClass));
} }
static PyObject *
rpmfi_iter(rpmfiObject * s)
{
Py_INCREF(s);
return (PyObject *)s;
}
static PyObject * static PyObject *
rpmfi_iternext(rpmfiObject * s) rpmfi_iternext(rpmfiObject * s)
{ {
@ -440,7 +433,7 @@ PyTypeObject rpmfi_Type = {
0, /* tp_clear */ 0, /* tp_clear */
0, /* tp_richcompare */ 0, /* tp_richcompare */
0, /* tp_weaklistoffset */ 0, /* tp_weaklistoffset */
(getiterfunc) rpmfi_iter, /* tp_iter */ PyObject_SelfIter, /* tp_iter */
(iternextfunc) rpmfi_iternext, /* tp_iternext */ (iternextfunc) rpmfi_iternext, /* tp_iternext */
rpmfi_methods, /* tp_methods */ rpmfi_methods, /* tp_methods */
0, /* tp_members */ 0, /* tp_members */

11
python/rpmmi-py.c
View File

@ -73,15 +73,6 @@ struct rpmmiObject_s {
rpmdbMatchIterator mi; rpmdbMatchIterator mi;
} ; } ;
/**
*/
static PyObject *
rpmmi_iter(rpmmiObject * s)
{
Py_INCREF(s);
return (PyObject *)s;
}
/** /**
*/ */
static PyObject * static PyObject *
@ -221,7 +212,7 @@ PyTypeObject rpmmi_Type = {
0, /* tp_clear */ 0, /* tp_clear */
0, /* tp_richcompare */ 0, /* tp_richcompare */
0, /* tp_weaklistoffset */ 0, /* tp_weaklistoffset */
(getiterfunc) rpmmi_iter, /* tp_iter */ PyObject_SelfIter, /* tp_iter */
(iternextfunc) rpmmi_iternext, /* tp_iternext */ (iternextfunc) rpmmi_iternext, /* tp_iternext */
rpmmi_methods, /* tp_methods */ rpmmi_methods, /* tp_methods */
0, /* tp_members */ 0, /* tp_members */

12
python/rpmps-py.c
View File

@ -48,16 +48,6 @@ rpmps_append(rpmpsObject * s, PyObject * value)
return 0; return 0;
} }
static PyObject *
rpmps_iter(rpmpsObject * s)
{
if (_rpmps_debug < 0)
fprintf(stderr, "*** rpmps_iter(%p)\n", s);
s->psi = rpmpsInitIterator(s->ps);
Py_INCREF(s);
return (PyObject *)s;
}
static PyObject * static PyObject *
rpmps_iternext(rpmpsObject * s) rpmps_iternext(rpmpsObject * s)
{ {
@ -219,7 +209,7 @@ PyTypeObject rpmps_Type = {
0, /* tp_clear */ 0, /* tp_clear */
(richcmpfunc)0, /* tp_richcompare */ (richcmpfunc)0, /* tp_richcompare */
0, /* tp_weaklistoffset */ 0, /* tp_weaklistoffset */
(getiterfunc) rpmps_iter, /* tp_iter */ PyObject_SelfIter, /* tp_iter */
(iternextfunc) rpmps_iternext, /* tp_iternext */ (iternextfunc) rpmps_iternext, /* tp_iternext */
rpmps_methods, /* tp_methods */ rpmps_methods, /* tp_methods */
0, /* tp_members */ 0, /* tp_members */

12
python/rpmts-py.c
View File

@ -969,16 +969,6 @@ fprintf(stderr, "*** rpmts_Run(%p) ts %p ignore %x\n", s, s->ts, s->ignoreSet);
return list; return list;
} }
static PyObject *
rpmts_iter(rpmtsObject * s)
{
if (_rpmts_debug)
fprintf(stderr, "*** rpmts_iter(%p) ts %p\n", s, s->ts);
Py_INCREF(s);
return (PyObject *)s;
}
/** /**
* @todo Add TR_ADDED filter to iterator. * @todo Add TR_ADDED filter to iterator.
*/ */
@ -1335,7 +1325,7 @@ PyTypeObject rpmts_Type = {
0, /* tp_clear */ 0, /* tp_clear */
0, /* tp_richcompare */ 0, /* tp_richcompare */
0, /* tp_weaklistoffset */ 0, /* tp_weaklistoffset */
(getiterfunc) rpmts_iter, /* tp_iter */ PyObject_SelfIter, /* tp_iter */
(iternextfunc) rpmts_iternext, /* tp_iternext */ (iternextfunc) rpmts_iternext, /* tp_iternext */
rpmts_methods, /* tp_methods */ rpmts_methods, /* tp_methods */
0, /* tp_members */ 0, /* tp_members */