diff options
author | Raymond Hettinger <python@rcn.com> | 2003-03-17 19:46:11 (GMT) |
---|---|---|
committer | Raymond Hettinger <python@rcn.com> | 2003-03-17 19:46:11 (GMT) |
commit | 1da1dbf4586afbd6b5d5c3cf244a1a3ea0f4382b (patch) | |
tree | cd4b433bcd0fd65cb0fa85586dc46e86a6d7370d /Objects | |
parent | ab75840cd07ee41598d3d5cc14dcf49b272664d3 (diff) | |
download | cpython-1da1dbf4586afbd6b5d5c3cf244a1a3ea0f4382b.zip cpython-1da1dbf4586afbd6b5d5c3cf244a1a3ea0f4382b.tar.gz cpython-1da1dbf4586afbd6b5d5c3cf244a1a3ea0f4382b.tar.bz2 |
Renamed PyObject_GenericGetIter to PyObject_SelfIter
to more accurately describe what the function does.
Suggested by Thomas Wouters.
Diffstat (limited to 'Objects')
-rw-r--r-- | Objects/dictobject.c | 2 | ||||
-rw-r--r-- | Objects/enumobject.c | 2 | ||||
-rw-r--r-- | Objects/iterobject.c | 4 | ||||
-rw-r--r-- | Objects/listobject.c | 2 | ||||
-rw-r--r-- | Objects/object.c | 2 | ||||
-rw-r--r-- | Objects/rangeobject.c | 2 | ||||
-rw-r--r-- | Objects/tupleobject.c | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/Objects/dictobject.c b/Objects/dictobject.c index 52e516f..6c86235 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 cd6ca67..c7e4365 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 7970fa6..ab6e3e0 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 75ad235..6228e64 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 eb4d8f7..9ce3de7 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 5dbbf13..299f4a6 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 ede18e0..282da3e 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 */ }; |