py/{modbuiltins,obj}: Use MP_PYTHON_PRINTER where possible.

This commit is contained in:
Paul Sokolovsky 2016-10-22 01:07:07 +03:00
parent f64e806f50
commit 3730090d8f
2 changed files with 3 additions and 12 deletions

View File

@ -430,13 +430,8 @@ MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_print_obj, 0, mp_builtin_print);
STATIC mp_obj_t mp_builtin___repl_print__(mp_obj_t o) { STATIC mp_obj_t mp_builtin___repl_print__(mp_obj_t o) {
if (o != mp_const_none) { if (o != mp_const_none) {
#if MICROPY_PY_IO mp_obj_print_helper(MP_PYTHON_PRINTER, o, PRINT_REPR);
mp_obj_print_helper(&mp_sys_stdout_print, o, PRINT_REPR); mp_print_str(MP_PYTHON_PRINTER, "\n");
mp_print_str(&mp_sys_stdout_print, "\n");
#else
mp_obj_print_helper(&mp_plat_print, o, PRINT_REPR);
mp_print_str(&mp_plat_print, "\n");
#endif
#if MICROPY_CAN_OVERRIDE_BUILTINS #if MICROPY_CAN_OVERRIDE_BUILTINS
// Set "_" special variable // Set "_" special variable
mp_obj_t dest[2] = {MP_OBJ_SENTINEL, o}; mp_obj_t dest[2] = {MP_OBJ_SENTINEL, o};

View File

@ -76,11 +76,7 @@ void mp_obj_print_helper(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t
} }
void mp_obj_print(mp_obj_t o_in, mp_print_kind_t kind) { void mp_obj_print(mp_obj_t o_in, mp_print_kind_t kind) {
#if MICROPY_PY_IO mp_obj_print_helper(MP_PYTHON_PRINTER, o_in, kind);
mp_obj_print_helper(&mp_sys_stdout_print, o_in, kind);
#else
mp_obj_print_helper(&mp_plat_print, o_in, kind);
#endif
} }
// helper function to print an exception with traceback // helper function to print an exception with traceback