Renamed PyObject_GenericGetIter to PyObject_SelfIter

to more accurately describe what the function does.

Suggested by Thomas Wouters.

diff --git a/Include/object.h b/Include/object.h
index 291e6054099a637ddb63ff3f0ae5a639918ac037..33e57a4659435f2767886adb04dd3541b3e9e23b 100644 (file)
--- 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 eda988ca04fd4eafcb03903b6bce1ecd4a20a777..987ded756b5c15bf86b22ace9cc3e6e2b559bc8f 100644 (file)
--- 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 8b286b4bb6a4447941be8af0a8ce2dc485e1ae41..da689700953b46f01a8ea0dc1605c7ed4becd8f3 100644 (file)
--- 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 ec4493563fa9dea582048ffc0da3f41783f6e677..e361c9407c6c5148fff75ebfcda3fc8906421e97 100644 (file)
--- 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 b0692969c418fccb7df723daae6c134111a9600d..618649048ccedbeb4ac4675530bace2021a8fb42 100644 (file)
--- 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 b0715f67ff6cf23480aae2e6562d716559929872..302d7dd4b311a254505949eb9a538611de237203 100644 (file)
--- 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 52e516f263f12496fb939766193ab833f706a205..6c862352c7c32667616518470a3fe1352cfbd4c7 100644 (file)
--- 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 cd6ca677342b7ecfb9665bc0917ab120b0dc53cd..c7e4365676b93db920d266214bf320e649de3385 100644 (file)
--- 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 7970fa6559a10a43402680ee0f36b1108da1f7d1..ab6e3e0f400e1f35cdbb99edbf7911d16d7cb132 100644 (file)
--- 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 75ad2352f55beb929f7b2600a8fac2c19ed78e69..6228e645dbf8d0c141ba5f567174525fb48bad73 100644 (file)
--- 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 eb4d8f7cfb178bca4d95eb105385593b87e1a68a..9ce3de7e06da0176a2cc7a40e1ccb64aa06ddc46 100644 (file)
--- 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 5dbbf1376ee7b9e4e5fb6fcf0f35ce29eadd1788..299f4a651f9fb779534343cd39eed92935a3a5c7 100644 (file)
--- 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 ede18e0ef46f1f8b9d517e3c9a8a27a34f79e733..282da3e8b97b6a776fa746ec1c44ebf6f8c1a611 100644 (file)
--- 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 */
 };