Author: christian.heimes
Date: Wed Nov 28 10:44:38 2007
New Revision: 59211
Modified:
python/branches/py3k/Lib/_abcoll.py
python/branches/py3k/Objects/dictobject.c
python/branches/py3k/Objects/iterobject.c
python/branches/py3k/Objects/listobject.c
python/branches/py3k/Objects/rangeobject.c
python/branches/py3k/Objects/setobject.c
python/branches/py3k/Objects/unicodeobject.c
Log:
Added view and iterator types to collections / _abcoll
I've also renamed several of the iterators to keep a consistent naming schema.
Modified: python/branches/py3k/Lib/_abcoll.py
==============================================================================
--- python/branches/py3k/Lib/_abcoll.py (original)
+++ python/branches/py3k/Lib/_abcoll.py Wed Nov 28 10:44:38 2007
@@ -17,8 +17,35 @@
"MappingView", "KeysView", "ItemsView", "ValuesView",
"Sequence", "MutableSequence",
"ByteString",
+ "bytearray_iterator", "bytes_iterator", "dict_itemiterator",
+ "dict_items", "dict_keyiterator", "dict_keys",
+ "dict_valueiterator", "dict_values", "list_iterator",
+ "list_reverseiterator", "range_iterator", "set_iterator",
+ "str_iterator", "tuple_iterator", "zip_iterator",
]
+
+### collection related types which are not exposed through builtin ###
+## iterators ##
+bytes_iterator = type(iter(b''))
+bytearray_iterator = type(iter(bytearray()))
+#callable_iterator = ???
+dict_keyiterator = type(iter({}.keys()))
+dict_valueiterator = type(iter({}.values()))
+dict_itemiterator = type(iter({}.items()))
+list_iterator = type(iter([]))
+list_reverseiterator = type(iter(reversed([])))
+range_iterator = type(iter(range(0)))
+set_iterator = type(iter(set()))
+str_iterator = type(iter(""))
+tuple_iterator = type(iter(()))
+zip_iterator = type(iter(zip()))
+## views ##
+dict_keys = type({}.keys())
+dict_values = type({}.values())
+dict_items = type({}.items())
+
+
### ONE-TRICK PONIES ###
class Hashable(metaclass=ABCMeta):
@@ -69,6 +96,19 @@
return True
return NotImplemented
+Iterator.register(bytes_iterator)
+Iterator.register(bytearray_iterator)
+#Iterator.register(callable_iterator)
+Iterator.register(dict_keyiterator)
+Iterator.register(dict_valueiterator)
+Iterator.register(dict_itemiterator)
+Iterator.register(list_iterator)
+Iterator.register(list_reverseiterator)
+Iterator.register(range_iterator)
+Iterator.register(set_iterator)
+Iterator.register(str_iterator)
+Iterator.register(tuple_iterator)
+Iterator.register(zip_iterator)
class Sized(metaclass=ABCMeta):
@@ -349,7 +389,7 @@
for key in self._mapping:
yield key
-KeysView.register(type({}.keys()))
+KeysView.register(dict_keys)
class ItemsView(MappingView, Set):
@@ -367,7 +407,7 @@
for key in self._mapping:
yield (key, self._mapping[key])
-ItemsView.register(type({}.items()))
+ItemsView.register(dict_items)
class ValuesView(MappingView):
@@ -382,7 +422,7 @@
for key in self._mapping:
yield self._mapping[key]
-ValuesView.register(type({}.values()))
+ValuesView.register(dict_values)
class MutableMapping(Mapping):
Modified: python/branches/py3k/Objects/dictobject.c
==============================================================================
--- python/branches/py3k/Objects/dictobject.c (original)
+++ python/branches/py3k/Objects/dictobject.c Wed Nov 28 10:44:38 2007
@@ -2148,7 +2148,7 @@
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 @@
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 @@
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 */
Modified: python/branches/py3k/Objects/iterobject.c
==============================================================================
--- python/branches/py3k/Objects/iterobject.c (original)
+++ python/branches/py3k/Objects/iterobject.c Wed Nov 28 10:44:38 2007
@@ -369,7 +369,7 @@
static PyTypeObject PyZipIter_Type = {
PyVarObject_HEAD_INIT(0, 0)
- "zipiterator", /* tp_name */
+ "zip_iterator", /* tp_name */
sizeof(zipiterobject), /* tp_basicsize */
0, /* tp_itemsize */
/* methods */
Modified: python/branches/py3k/Objects/listobject.c
==============================================================================
--- python/branches/py3k/Objects/listobject.c (original)
+++ python/branches/py3k/Objects/listobject.c Wed Nov 28 10:44:38 2007
@@ -2726,7 +2726,7 @@
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 @@
PyTypeObject PyListRevIter_Type = {
PyVarObject_HEAD_INIT(&PyType_Type, 0)
- "listreverseiterator", /* tp_name */
+ "list_reverseiterator", /* tp_name */
sizeof(listreviterobject), /* tp_basicsize */
0, /* tp_itemsize */
/* methods */
Modified: python/branches/py3k/Objects/rangeobject.c
==============================================================================
--- python/branches/py3k/Objects/rangeobject.c (original)
+++ python/branches/py3k/Objects/rangeobject.c Wed Nov 28 10:44:38 2007
@@ -369,7 +369,7 @@
PyTypeObject Pyrangeiter_Type = {
PyVarObject_HEAD_INIT(&PyType_Type, 0)
- "rangeiterator", /* tp_name */
+ "range_iterator", /* tp_name */
sizeof(rangeiterobject), /* tp_basicsize */
0, /* tp_itemsize */
/* methods */
Modified: python/branches/py3k/Objects/setobject.c
==============================================================================
--- python/branches/py3k/Objects/setobject.c (original)
+++ python/branches/py3k/Objects/setobject.c Wed Nov 28 10:44:38 2007
@@ -851,7 +851,7 @@
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 */
Modified: python/branches/py3k/Objects/unicodeobject.c
==============================================================================
--- python/branches/py3k/Objects/unicodeobject.c (original)
+++ python/branches/py3k/Objects/unicodeobject.c Wed Nov 28 10:44:38 2007
@@ -9263,7 +9263,7 @@
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 */
_______________________________________________
Python-3000-checkins mailing list
[email protected]
http://mail.python.org/mailman/listinfo/python-3000-checkins
