mirror of https://github.com/python/cpython
Renamed PyObject_GenericGetIter to PyObject_SelfIter
to more accurately describe what the function does. Suggested by Thomas Wouters.
This commit is contained in:
parent
ab75840cd0
commit
1da1dbf458
|
@ -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 *);
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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 */
|
||||
};
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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 */
|
||||
};
|
||||
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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 */
|
||||
};
|
||||
|
|
|
@ -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 */
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue