3 files changed, 4 insertions, 7 deletions
diff --git a/ports/unix/modjni.c b/ports/unix/modjni.c
index 02368e4537..e6b874b235 100644
--- a/ports/unix/modjni.c
+++ b/ports/unix/modjni.c
@@ -325,13 +325,13 @@ STATIC mp_obj_t subscr_getiter(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf) {
 STATIC MP_DEFINE_CONST_OBJ_TYPE(
     jobject_type,
     MP_QSTR_jobject,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_GETITER,
     MP_TYPE_NULL_MAKE_NEW,
     print, jobject_print,
     unary_op, jobject_unary_op,
     attr, jobject_attr,
     subscr, jobject_subscr,
-    getiter, subscr_getiter,
+    iter, subscr_getiter,
     //    .locals_dict = &jobject_locals_dict,
     );
 
diff --git a/ports/unix/moduselect.c b/ports/unix/moduselect.c
index baed88761c..674841bf18 100644
--- a/ports/unix/moduselect.c
+++ b/ports/unix/moduselect.c
@@ -314,10 +314,9 @@ STATIC MP_DEFINE_CONST_DICT(poll_locals_dict, poll_locals_dict_table);
 STATIC MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_poll,
     MP_QSTR_poll,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_ITERNEXT,
     MP_TYPE_NULL_MAKE_NEW,
-    getiter, mp_identity_getiter,
-    iternext, poll_iternext,
+    iter, poll_iternext,
     locals_dict, &poll_locals_dict
     );
 
diff --git a/ports/unix/modusocket.c b/ports/unix/modusocket.c
index 21260f0b2a..dfbf15cd3e 100644
--- a/ports/unix/modusocket.c
+++ b/ports/unix/modusocket.c
@@ -522,8 +522,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     socket_make_new,
     print, socket_print,
-    getiter, NULL,
-    iternext, NULL,
     protocol, &usocket_stream_p,
     locals_dict, &usocket_locals_dict
     );