From 1da1dbf4586afbd6b5d5c3cf244a1a3ea0f4382b Mon Sep 17 00:00:00 2001 From: Raymond Hettinger Date: Mon, 17 Mar 2003 19:46:11 +0000 Subject: [PATCH] Renamed PyObject_GenericGetIter to PyObject_SelfIter to more accurately describe what the function does. Suggested by Thomas Wouters. --- Include/object.h | 2 +- Misc/NEWS | 2 +- Modules/_hotshot.c | 2 +- Modules/arraymodule.c | 2 +- Modules/itertoolsmodule.c | 24 ++++++++++++------------ Modules/xreadlinesmodule.c | 2 +- Objects/dictobject.c | 2 +- Objects/enumobject.c | 2 +- Objects/iterobject.c | 4 ++-- Objects/listobject.c | 2 +- Objects/object.c | 2 +- Objects/rangeobject.c | 2 +- Objects/tupleobject.c | 2 +- 13 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Include/object.h b/Include/object.h index 291e6054099..33e57a46594 100644 --- a/Include/object.h +++ b/Include/object.h @@ -385,7 +385,7 @@ PyAPI_FUNC(PyObject *) PyObject_GetAttr(PyObject *, PyObject *); PyAPI_FUNC(int) PyObject_SetAttr(PyObject *, PyObject *, PyObject *); PyAPI_FUNC(int) PyObject_HasAttr(PyObject *, PyObject *); PyAPI_FUNC(PyObject **) _PyObject_GetDictPtr(PyObject *); -PyAPI_FUNC(PyObject *) PyObject_GenericGetIter(PyObject *); +PyAPI_FUNC(PyObject *) PyObject_SelfIter(PyObject *); PyAPI_FUNC(PyObject *) PyObject_GenericGetAttr(PyObject *, PyObject *); PyAPI_FUNC(int) PyObject_GenericSetAttr(PyObject *, PyObject *, PyObject *); diff --git a/Misc/NEWS b/Misc/NEWS index eda988ca04f..987ded756b5 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -86,7 +86,7 @@ Build C API ----- -- Added PyObject_GenericGetIter() to fill the tp_iter slot for the +- Added PyObject_SelfIter() to fill the tp_iter slot for the typical case where the method returns its self argument. - The extended type structure used for heap types (new-style diff --git a/Modules/_hotshot.c b/Modules/_hotshot.c index 8b286b4bb6a..da689700953 100644 --- a/Modules/_hotshot.c +++ b/Modules/_hotshot.c @@ -1345,7 +1345,7 @@ static PyTypeObject LogReaderType = { 0, /* tp_clear */ 0, /* tp_richcompare */ 0, /* tp_weaklistoffset */ - PyObject_GenericGetIter, /* tp_iter */ + PyObject_SelfIter, /* tp_iter */ (iternextfunc)logreader_tp_iternext,/* tp_iternext */ logreader_methods, /* tp_methods */ logreader_members, /* tp_members */ diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c index ec4493563fa..e361c9407c6 100644 --- a/Modules/arraymodule.c +++ b/Modules/arraymodule.c @@ -2014,7 +2014,7 @@ static PyTypeObject PyArrayIter_Type = { 0, /* tp_clear */ 0, /* tp_richcompare */ 0, /* tp_weaklistoffset */ - PyObject_GenericGetIter, /* tp_iter */ + PyObject_SelfIter, /* tp_iter */ (iternextfunc)arrayiter_next, /* tp_iternext */ 0, /* tp_methods */ }; diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c index b0692969c41..618649048cc 100644 --- a/Modules/itertoolsmodule.c +++ b/Modules/itertoolsmodule.c @@ -140,7 +140,7 @@ PyTypeObject cycle_type = { 0, /* tp_clear */ 0, /* tp_richcompare */ 0, /* tp_weaklistoffset */ - PyObject_GenericGetIter, /* tp_iter */ + PyObject_SelfIter, /* tp_iter */ (iternextfunc)cycle_next, /* tp_iternext */ 0, /* tp_methods */ 0, /* tp_members */ @@ -289,7 +289,7 @@ PyTypeObject dropwhile_type = { 0, /* tp_clear */ 0, /* tp_richcompare */ 0, /* tp_weaklistoffset */ - PyObject_GenericGetIter, /* tp_iter */ + PyObject_SelfIter, /* tp_iter */ (iternextfunc)dropwhile_next, /* tp_iternext */ 0, /* tp_methods */ 0, /* tp_members */ @@ -437,7 +437,7 @@ PyTypeObject takewhile_type = { 0, /* tp_clear */ 0, /* tp_richcompare */ 0, /* tp_weaklistoffset */ - PyObject_GenericGetIter, /* tp_iter */ + PyObject_SelfIter, /* tp_iter */ (iternextfunc)takewhile_next, /* tp_iternext */ 0, /* tp_methods */ 0, /* tp_members */ @@ -607,7 +607,7 @@ PyTypeObject islice_type = { 0, /* tp_clear */ 0, /* tp_richcompare */ 0, /* tp_weaklistoffset */ - PyObject_GenericGetIter, /* tp_iter */ + PyObject_SelfIter, /* tp_iter */ (iternextfunc)islice_next, /* tp_iternext */ 0, /* tp_methods */ 0, /* tp_members */ @@ -746,7 +746,7 @@ PyTypeObject starmap_type = { 0, /* tp_clear */ 0, /* tp_richcompare */ 0, /* tp_weaklistoffset */ - PyObject_GenericGetIter, /* tp_iter */ + PyObject_SelfIter, /* tp_iter */ (iternextfunc)starmap_next, /* tp_iternext */ 0, /* tp_methods */ 0, /* tp_members */ @@ -933,7 +933,7 @@ PyTypeObject imap_type = { 0, /* tp_clear */ 0, /* tp_richcompare */ 0, /* tp_weaklistoffset */ - PyObject_GenericGetIter, /* tp_iter */ + PyObject_SelfIter, /* tp_iter */ (iternextfunc)imap_next, /* tp_iternext */ 0, /* tp_methods */ 0, /* tp_members */ @@ -1068,7 +1068,7 @@ PyTypeObject chain_type = { 0, /* tp_clear */ 0, /* tp_richcompare */ 0, /* tp_weaklistoffset */ - PyObject_GenericGetIter, /* tp_iter */ + PyObject_SelfIter, /* tp_iter */ (iternextfunc)chain_next, /* tp_iternext */ 0, /* tp_methods */ 0, /* tp_members */ @@ -1217,7 +1217,7 @@ PyTypeObject ifilter_type = { 0, /* tp_clear */ 0, /* tp_richcompare */ 0, /* tp_weaklistoffset */ - PyObject_GenericGetIter, /* tp_iter */ + PyObject_SelfIter, /* tp_iter */ (iternextfunc)ifilter_next, /* tp_iternext */ 0, /* tp_methods */ 0, /* tp_members */ @@ -1366,7 +1366,7 @@ PyTypeObject ifilterfalse_type = { 0, /* tp_clear */ 0, /* tp_richcompare */ 0, /* tp_weaklistoffset */ - PyObject_GenericGetIter, /* tp_iter */ + PyObject_SelfIter, /* tp_iter */ (iternextfunc)ifilterfalse_next, /* tp_iternext */ 0, /* tp_methods */ 0, /* tp_members */ @@ -1450,7 +1450,7 @@ PyTypeObject count_type = { 0, /* tp_clear */ 0, /* tp_richcompare */ 0, /* tp_weaklistoffset */ - PyObject_GenericGetIter, /* tp_iter */ + PyObject_SelfIter, /* tp_iter */ (iternextfunc)count_next, /* tp_iternext */ 0, /* tp_methods */ 0, /* tp_members */ @@ -1634,7 +1634,7 @@ PyTypeObject izip_type = { 0, /* tp_clear */ 0, /* tp_richcompare */ 0, /* tp_weaklistoffset */ - PyObject_GenericGetIter, /* tp_iter */ + PyObject_SelfIter, /* tp_iter */ (iternextfunc)izip_next, /* tp_iternext */ 0, /* tp_methods */ 0, /* tp_members */ @@ -1741,7 +1741,7 @@ PyTypeObject repeat_type = { 0, /* tp_clear */ 0, /* tp_richcompare */ 0, /* tp_weaklistoffset */ - PyObject_GenericGetIter, /* tp_iter */ + PyObject_SelfIter, /* tp_iter */ (iternextfunc)repeat_next, /* tp_iternext */ 0, /* tp_methods */ 0, /* tp_members */ diff --git a/Modules/xreadlinesmodule.c b/Modules/xreadlinesmodule.c index b0715f67ff6..302d7dd4b31 100644 --- a/Modules/xreadlinesmodule.c +++ b/Modules/xreadlinesmodule.c @@ -152,7 +152,7 @@ static PyTypeObject XReadlinesObject_Type = { 0, /* tp_clear */ 0, /* tp_richcompare */ 0, /* tp_weaklistoffset */ - PyObject_GenericGetIter, /* tp_iter */ + PyObject_SelfIter, /* tp_iter */ (iternextfunc)xreadlines_iternext, /* tp_iternext */ }; diff --git a/Objects/dictobject.c b/Objects/dictobject.c index 52e516f263f..6c862352c7c 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -2062,7 +2062,7 @@ PyTypeObject PyDictIter_Type = { 0, /* tp_clear */ 0, /* tp_richcompare */ 0, /* tp_weaklistoffset */ - PyObject_GenericGetIter, /* tp_iter */ + PyObject_SelfIter, /* tp_iter */ (iternextfunc)dictiter_iternext, /* tp_iternext */ 0, /* tp_methods */ 0, /* tp_members */ diff --git a/Objects/enumobject.c b/Objects/enumobject.c index cd6ca677342..c7e4365676b 100644 --- a/Objects/enumobject.c +++ b/Objects/enumobject.c @@ -110,7 +110,7 @@ PyTypeObject PyEnum_Type = { 0, /* tp_clear */ 0, /* tp_richcompare */ 0, /* tp_weaklistoffset */ - PyObject_GenericGetIter, /* tp_iter */ + PyObject_SelfIter, /* tp_iter */ (iternextfunc)enum_next, /* tp_iternext */ 0, /* tp_methods */ 0, /* tp_members */ diff --git a/Objects/iterobject.c b/Objects/iterobject.c index 7970fa6559a..ab6e3e0f400 100644 --- a/Objects/iterobject.c +++ b/Objects/iterobject.c @@ -99,7 +99,7 @@ PyTypeObject PySeqIter_Type = { 0, /* tp_clear */ 0, /* tp_richcompare */ 0, /* tp_weaklistoffset */ - PyObject_GenericGetIter, /* tp_iter */ + PyObject_SelfIter, /* tp_iter */ (iternextfunc)iter_iternext, /* tp_iternext */ 0, /* tp_methods */ 0, /* tp_members */ @@ -216,7 +216,7 @@ PyTypeObject PyCallIter_Type = { 0, /* tp_clear */ 0, /* tp_richcompare */ 0, /* tp_weaklistoffset */ - PyObject_GenericGetIter, /* tp_iter */ + PyObject_SelfIter, /* tp_iter */ (iternextfunc)calliter_iternext, /* tp_iternext */ 0, /* tp_methods */ 0, /* tp_members */ diff --git a/Objects/listobject.c b/Objects/listobject.c index 75ad2352f55..6228e645dbf 100644 --- a/Objects/listobject.c +++ b/Objects/listobject.c @@ -2450,7 +2450,7 @@ PyTypeObject PyListIter_Type = { 0, /* tp_clear */ 0, /* tp_richcompare */ 0, /* tp_weaklistoffset */ - PyObject_GenericGetIter, /* tp_iter */ + PyObject_SelfIter, /* tp_iter */ (iternextfunc)listiter_next, /* tp_iternext */ 0, /* tp_methods */ 0, /* tp_members */ diff --git a/Objects/object.c b/Objects/object.c index eb4d8f7cfb1..9ce3de7e06d 100644 --- a/Objects/object.c +++ b/Objects/object.c @@ -1301,7 +1301,7 @@ _PyObject_GetDictPtr(PyObject *obj) /* Generic GetAttr functions - put these in your tp_[gs]etattro slot */ PyObject * -PyObject_GenericGetIter(PyObject *obj) +PyObject_SelfIter(PyObject *obj) { Py_INCREF(obj); return obj; diff --git a/Objects/rangeobject.c b/Objects/rangeobject.c index 5dbbf1376ee..299f4a651f9 100644 --- a/Objects/rangeobject.c +++ b/Objects/rangeobject.c @@ -281,7 +281,7 @@ static PyTypeObject Pyrangeiter_Type = { 0, /* tp_clear */ 0, /* tp_richcompare */ 0, /* tp_weaklistoffset */ - PyObject_GenericGetIter, /* tp_iter */ + PyObject_SelfIter, /* tp_iter */ (iternextfunc)rangeiter_next, /* tp_iternext */ 0, /* tp_methods */ }; diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c index ede18e0ef46..282da3e8b97 100644 --- a/Objects/tupleobject.c +++ b/Objects/tupleobject.c @@ -831,6 +831,6 @@ PyTypeObject PyTupleIter_Type = { 0, /* tp_clear */ 0, /* tp_richcompare */ 0, /* tp_weaklistoffset */ - PyObject_GenericGetIter, /* tp_iter */ + PyObject_SelfIter, /* tp_iter */ (iternextfunc)tupleiter_next, /* tp_iternext */ };