diff options
| author | Christian Heimes <christian@cheimes.de> | 2007-11-28 09:44:38 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2007-11-28 09:44:38 (GMT) |
| commit | f83be4e3f353c4cfb53a22793dd1394797988c30 (patch) | |
| tree | f3a4c1535a6b18cca165f1b24f1fe51f6c49eef3 /Objects | |
| parent | c9543e42330e5f339d6419eba6a8c5a61a39aeca (diff) | |
| download | cpython-f83be4e3f353c4cfb53a22793dd1394797988c30.zip cpython-f83be4e3f353c4cfb53a22793dd1394797988c30.tar.gz cpython-f83be4e3f353c4cfb53a22793dd1394797988c30.tar.bz2 | |
Added view and iterator types to collections / _abcoll
I've also renamed several of the iterators to keep a consistent naming schema.
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/dictobject.c | 6 | ||||
| -rw-r--r-- | Objects/iterobject.c | 2 | ||||
| -rw-r--r-- | Objects/listobject.c | 4 | ||||
| -rw-r--r-- | Objects/rangeobject.c | 2 | ||||
| -rw-r--r-- | Objects/setobject.c | 2 | ||||
| -rw-r--r-- | Objects/unicodeobject.c | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/Objects/dictobject.c b/Objects/dictobject.c index 7bff7d8..b849f57 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -2148,7 +2148,7 @@ fail: PyTypeObject PyDictIterKey_Type = { PyVarObject_HEAD_INIT(&PyType_Type, 0) - "dictionary-keyiterator", /* tp_name */ + "dict_keyiterator", /* tp_name */ sizeof(dictiterobject), /* tp_basicsize */ 0, /* tp_itemsize */ /* methods */ @@ -2220,7 +2220,7 @@ fail: PyTypeObject PyDictIterValue_Type = { PyVarObject_HEAD_INIT(&PyType_Type, 0) - "dictionary-valueiterator", /* tp_name */ + "dict_valueiterator", /* tp_name */ sizeof(dictiterobject), /* tp_basicsize */ 0, /* tp_itemsize */ /* methods */ @@ -2306,7 +2306,7 @@ fail: PyTypeObject PyDictIterItem_Type = { PyVarObject_HEAD_INIT(&PyType_Type, 0) - "dictionary-itemiterator", /* tp_name */ + "dict_itemiterator", /* tp_name */ sizeof(dictiterobject), /* tp_basicsize */ 0, /* tp_itemsize */ /* methods */ diff --git a/Objects/iterobject.c b/Objects/iterobject.c index 32b9f94..ce9c661 100644 --- a/Objects/iterobject.c +++ b/Objects/iterobject.c @@ -369,7 +369,7 @@ zipiter_next(zipiterobject *zit) static PyTypeObject PyZipIter_Type = { PyVarObject_HEAD_INIT(0, 0) - "zipiterator", /* tp_name */ + "zip_iterator", /* tp_name */ sizeof(zipiterobject), /* tp_basicsize */ 0, /* tp_itemsize */ /* methods */ diff --git a/Objects/listobject.c b/Objects/listobject.c index 5df40fa..1d82e35 100644 --- a/Objects/listobject.c +++ b/Objects/listobject.c @@ -2726,7 +2726,7 @@ static PyMethodDef listiter_methods[] = { PyTypeObject PyListIter_Type = { PyVarObject_HEAD_INIT(&PyType_Type, 0) - "listiterator", /* tp_name */ + "list_iterator", /* tp_name */ sizeof(listiterobject), /* tp_basicsize */ 0, /* tp_itemsize */ /* methods */ @@ -2848,7 +2848,7 @@ static PySequenceMethods listreviter_as_sequence = { PyTypeObject PyListRevIter_Type = { PyVarObject_HEAD_INIT(&PyType_Type, 0) - "listreverseiterator", /* tp_name */ + "list_reverseiterator", /* tp_name */ sizeof(listreviterobject), /* tp_basicsize */ 0, /* tp_itemsize */ /* methods */ diff --git a/Objects/rangeobject.c b/Objects/rangeobject.c index 0bb3e7b..d1c959a 100644 --- a/Objects/rangeobject.c +++ b/Objects/rangeobject.c @@ -369,7 +369,7 @@ static PyMethodDef rangeiter_methods[] = { PyTypeObject Pyrangeiter_Type = { PyVarObject_HEAD_INIT(&PyType_Type, 0) - "rangeiterator", /* tp_name */ + "range_iterator", /* tp_name */ sizeof(rangeiterobject), /* tp_basicsize */ 0, /* tp_itemsize */ /* methods */ diff --git a/Objects/setobject.c b/Objects/setobject.c index d85a28d..e4e7780 100644 --- a/Objects/setobject.c +++ b/Objects/setobject.c @@ -851,7 +851,7 @@ fail: static PyTypeObject PySetIter_Type = { PyVarObject_HEAD_INIT(&PyType_Type, 0) - "setiterator", /* tp_name */ + "set_iterator", /* tp_name */ sizeof(setiterobject), /* tp_basicsize */ 0, /* tp_itemsize */ /* methods */ diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 205576f..26349ef 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -9263,7 +9263,7 @@ static PyMethodDef unicodeiter_methods[] = { PyTypeObject PyUnicodeIter_Type = { PyVarObject_HEAD_INIT(&PyType_Type, 0) - "unicode_iterator", /* tp_name */ + "str_iterator", /* tp_name */ sizeof(unicodeiterobject), /* tp_basicsize */ 0, /* tp_itemsize */ /* methods */ |