Merge pull request #1867 from tannewt/hide_reload_traceback

dhalbert · web-flow · commit 839bac47d431 · 2019-05-08T19:40:55.000-04:00
Hide the traceback for the ReloadException.
diff --git a/lib/utils/pyexec.c b/lib/utils/pyexec.c
@@ -131,7 +131,9 @@ STATIC int parse_compile_execute(const void *source, mp_parse_input_kind_t input
             // at the moment, the value of SystemExit is unused
             ret = pyexec_system_exit;
         } else {
-            mp_obj_print_exception(&mp_plat_print, (mp_obj_t)nlr.ret_val);
+            if ((mp_obj_t) nlr.ret_val != MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_reload_exception))) {
+                mp_obj_print_exception(&mp_plat_print, (mp_obj_t)nlr.ret_val);
+            }
             ret = PYEXEC_EXCEPTION;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,9 @@ STATIC int parse_compile_execute(const void *source, mp_parse_input_kind_t input`
`131`	`131`	`// at the moment, the value of SystemExit is unused`
`132`	`132`	`ret = pyexec_system_exit;`
`133`	`133`	`} else {`
`134`		`- mp_obj_print_exception(&mp_plat_print, (mp_obj_t)nlr.ret_val);`
	`134`	`+ if ((mp_obj_t) nlr.ret_val != MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_reload_exception))) {`
	`135`	`+ mp_obj_print_exception(&mp_plat_print, (mp_obj_t)nlr.ret_val);`
	`136`	`+ }`
`135`	`137`	`ret = PYEXEC_EXCEPTION;`
`136`	`138`	`}`
`137`	`139`	`}`