summaryrefslogtreecommitdiffstatshomepage
path: root/py
diff options
context:
space:
mode:
Diffstat (limited to 'py')
-rw-r--r--py/objgenerator.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/py/objgenerator.c b/py/objgenerator.c
index 0f0f84249b..4ba6bf7683 100644
--- a/py/objgenerator.c
+++ b/py/objgenerator.c
@@ -171,10 +171,12 @@ STATIC mp_obj_t gen_resume_and_raise(mp_obj_t self_in, mp_obj_t send_value, mp_o
// of mp_iternext() protocol, but this function is called by other methods
// too, which may not handled MP_OBJ_STOP_ITERATION.
if (mp_obj_is_subclass_fast(mp_obj_get_type(ret), &mp_type_StopIteration)) {
- return MP_OBJ_STOP_ITERATION;
- } else {
- nlr_raise(ret);
+ mp_obj_t val = mp_obj_exception_get_value(ret);
+ if (val == mp_const_none) {
+ return MP_OBJ_STOP_ITERATION;
+ }
}
+ nlr_raise(ret);
}
}