Skip to content

Commit a2bdf57

Browse files
committed
pyexec.c: fix pyexec_frozen_module
1 parent b94815c commit a2bdf57

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

shared/runtime/pyexec.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@ STATIC int parse_compile_execute(const void *source, mp_parse_input_kind_t input
144144
}
145145

146146
// execute code
147-
// CIRCUITPY-CHANGE
148147
if (!(exec_flags & EXEC_FLAG_NO_INTERRUPT)) {
149148
mp_hal_set_interrupt_char(CHAR_CTRL_C);
150149
}
@@ -787,7 +786,7 @@ int pyexec_file_if_exists(const char *filename, pyexec_result_t *result) {
787786
#if MICROPY_MODULE_FROZEN
788787
if (mp_find_frozen_module(filename, NULL, NULL) == MP_IMPORT_STAT_FILE) {
789788
// CIRCUITPY-CHANGE: pass result arg
790-
return pyexec_frozen_module(filename, result);
789+
return pyexec_frozen_module(filename, true, result);
791790
}
792791
#endif
793792
if (mp_import_stat(filename) != MP_IMPORT_STAT_FILE) {

shared/runtime/pyexec.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ int pyexec_friendly_repl(void);
6161
// CIRCUITPY-CHANGE: result out argument
6262
int pyexec_file(const char *filename, pyexec_result_t *result);
6363
int pyexec_file_if_exists(const char *filename, pyexec_result_t *result);
64-
int pyexec_frozen_module(const char *name, pyexec_result_t *result);
64+
int pyexec_frozen_module(const char *name, bool allow_keyboard_interrupt, pyexec_result_t *result);
6565
void pyexec_event_repl_init(void);
6666
int pyexec_event_repl_process_char(int c);
6767
extern uint8_t pyexec_repl_active;

0 commit comments

Comments
 (0)