commit f7eaf605c0b52217ea45a1e0a33cbba3e0a8a2ab
author Paul Sokolovsky <pfalcon@users.sourceforge.net> Sun Mar 30 22:00:12 2014 +0300
committer Paul Sokolovsky <pfalcon@users.sourceforge.net> Sun Mar 30 23:37:24 2014 +0300
tree b0869cc49ef0d1972529f7431d67a1037a57fecb
parent f39d3b93da4b9205a095430e12472051c6b22ef6

py: Fix "TypeError: 'iterator' object is not iterable", doh.

py/objarray.c

diff --git a/py/objarray.c b/py/objarray.c
index ea8654b..c91c553 100644
--- a/py/objarray.c
+++ b/py/objarray.c
@@ -219,6 +219,7 @@
 STATIC const mp_obj_type_t array_it_type = {
     { &mp_type_type },
     .name = MP_QSTR_iterator,
+    .getiter = mp_identity,
     .iternext = array_it_iternext,
 };
 

py/objdict.c

diff --git a/py/objdict.c b/py/objdict.c
index a9dbb76..01c7294 100644
--- a/py/objdict.c
+++ b/py/objdict.c
@@ -107,6 +107,7 @@
 STATIC const mp_obj_type_t mp_type_dict_it = {
     { &mp_type_type },
     .name = MP_QSTR_iterator,
+    .getiter = mp_identity,
     .iternext = dict_it_iternext,
 };
 
@@ -336,6 +337,7 @@
 STATIC const mp_obj_type_t dict_view_it_type = {
     { &mp_type_type },
     .name = MP_QSTR_iterator,
+    .getiter = mp_identity,
     .iternext = dict_view_it_iternext,
 };
 

py/objgetitemiter.c

diff --git a/py/objgetitemiter.c b/py/objgetitemiter.c
index 0923564..da0e476 100644
--- a/py/objgetitemiter.c
+++ b/py/objgetitemiter.c
@@ -38,6 +38,7 @@
 STATIC const mp_obj_type_t it_type = {
     { &mp_type_type },
     .name = MP_QSTR_iterator,
+    .getiter = mp_identity,
     .iternext = it_iternext
 };
 

py/objlist.c

diff --git a/py/objlist.c b/py/objlist.c
index 1030a86..244d4a5 100644
--- a/py/objlist.c
+++ b/py/objlist.c
@@ -408,6 +408,7 @@
 STATIC const mp_obj_type_t mp_type_list_it = {
     { &mp_type_type },
     .name = MP_QSTR_iterator,
+    .getiter = mp_identity,
     .iternext = list_it_iternext,
 };
 

py/objrange.c

diff --git a/py/objrange.c b/py/objrange.c
index c527dfa..64d9245 100644
--- a/py/objrange.c
+++ b/py/objrange.c
@@ -63,6 +63,7 @@
 STATIC const mp_obj_type_t range_it_type = {
     { &mp_type_type },
     .name = MP_QSTR_iterator,
+    .getiter = mp_identity,
     .iternext = range_it_iternext,
 };
 

py/objset.c

diff --git a/py/objset.c b/py/objset.c
index 2cabf6c..439c6e9 100644
--- a/py/objset.c
+++ b/py/objset.c
@@ -72,6 +72,7 @@
 const mp_obj_type_t mp_type_set_it = {
     { &mp_type_type },
     .name = MP_QSTR_iterator,
+    .getiter = mp_identity,
     .iternext = set_it_iternext,
 };
 

py/objstr.c

diff --git a/py/objstr.c b/py/objstr.c
index 2dd7015..751f93a 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -885,6 +885,7 @@
 STATIC const mp_obj_type_t mp_type_str_it = {
     { &mp_type_type },
     .name = MP_QSTR_iterator,
+    .getiter = mp_identity,
     .iternext = str_it_iternext,
 };
 
@@ -903,6 +904,7 @@
 STATIC const mp_obj_type_t mp_type_bytes_it = {
     { &mp_type_type },
     .name = MP_QSTR_iterator,
+    .getiter = mp_identity,
     .iternext = bytes_it_iternext,
 };
 

py/objtuple.c

diff --git a/py/objtuple.c b/py/objtuple.c
index 7f14509..d6a5bb3 100644
--- a/py/objtuple.c
+++ b/py/objtuple.c
@@ -251,6 +251,7 @@
 STATIC const mp_obj_type_t mp_type_tuple_it = {
     { &mp_type_type },
     .name = MP_QSTR_iterator,
+    .getiter = mp_identity,
     .iternext = tuple_it_iternext,
 };