diff options
author | Damien George <damien.p.george@gmail.com> | 2014-03-31 16:28:58 +0100 |
---|---|---|
committer | Damien George <damien.p.george@gmail.com> | 2014-03-31 16:28:58 +0100 |
commit | 43e92cfb521db55fb2d0001388c0e3a532405b50 (patch) | |
tree | e7f69bc029e9236a3adfdc228bdaa62102491b82 /py/vm.c | |
parent | 15d18069c50f7c02cb71417f3c4ffddff335fe70 (diff) | |
parent | e566670153adc1d995206eaf3a9e606000a789d4 (diff) |
Merge branch 'master' of github.com:micropython/micropython
Diffstat (limited to 'py/vm.c')
-rw-r--r-- | py/vm.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -769,7 +769,7 @@ yield: if (inject_exc != MP_OBJ_NULL) { t_exc = inject_exc; inject_exc = MP_OBJ_NULL; - ret_kind = mp_resume(TOP(), mp_const_none, t_exc, &obj2); + ret_kind = mp_resume(TOP(), MP_OBJ_NULL, t_exc, &obj2); } else { ret_kind = mp_resume(TOP(), obj1, MP_OBJ_NULL, &obj2); } |