djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into main

Browse Source
This commit is contained in:
Hosted Weblate 2021-02-15 21:10:55 +01:00
commit d696c8f3b5
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
py/builtinevex.c
View File

@ -132,17 +132,18 @@ STATIC mp_obj_t eval_exec_helper(size_t n_args, const mp_obj_t *args, mp_parse_i
} }
#endif #endif
size_t str_len; // Extract the source code.
const char *str = mp_obj_str_get_data(args[0], &str_len); mp_buffer_info_t bufinfo;
mp_get_buffer_raise(args[0], &bufinfo, MP_BUFFER_READ);
// create the lexer // create the lexer
// MP_PARSE_SINGLE_INPUT is used to indicate a file input // MP_PARSE_SINGLE_INPUT is used to indicate a file input
mp_lexer_t *lex; mp_lexer_t *lex;
if (MICROPY_PY_BUILTINS_EXECFILE && parse_input_kind == MP_PARSE_SINGLE_INPUT) { if (MICROPY_PY_BUILTINS_EXECFILE && parse_input_kind == MP_PARSE_SINGLE_INPUT) {
lex = mp_lexer_new_from_file(str); lex = mp_lexer_new_from_file(bufinfo.buf);
parse_input_kind = MP_PARSE_FILE_INPUT; parse_input_kind = MP_PARSE_FILE_INPUT;
} else { } else {
lex = mp_lexer_new_from_str_len(MP_QSTR__lt_string_gt_, str, str_len, 0); lex = mp_lexer_new_from_str_len(MP_QSTR__lt_string_gt_, bufinfo.buf, bufinfo.len, 0);
} }
return mp_parse_compile_execute(lex, parse_input_kind, globals, locals); return mp_parse_compile_execute(lex, parse_input_kind, globals, locals);