diff options
author | Colin Hogben <colin@infinnovation.co.uk> | 2016-04-21 20:17:50 +0100 |
---|---|---|
committer | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2016-04-25 18:54:59 +0300 |
commit | 104aa26271d38fc6204fcee6d65044716e4dae31 (patch) | |
tree | af6a225fae3d156ef336d152220fe4422b31c72e /teensy/help.c | |
parent | 2b46da234c8fc39f2df5d09ea0c7dc5e05f6635e (diff) | |
download | micropython-104aa26271d38fc6204fcee6d65044716e4dae31.tar.gz micropython-104aa26271d38fc6204fcee6d65044716e4dae31.zip |
cc3200, stmhal, teensy: Use pyhelp_print_obj function.
Update the help() implementations in the cc3200, stmhal and teensy
ports to use the pyhelp_print_obj function.
Diffstat (limited to 'teensy/help.c')
-rw-r--r-- | teensy/help.c | 37 |
1 files changed, 2 insertions, 35 deletions
diff --git a/teensy/help.c b/teensy/help.c index d8fe3a1d9c..147347fc22 100644 --- a/teensy/help.c +++ b/teensy/help.c @@ -26,7 +26,7 @@ #include <stdio.h> -#include "py/obj.h" +#include "lib/utils/pyhelp.h" STATIC const char *help_text = "Welcome to MicroPython!\n" @@ -70,14 +70,6 @@ STATIC const char *help_text = "For further help on a specific object, type help(obj)\n" ; -STATIC void pyb_help_print_info_about_object(mp_obj_t name_o, mp_obj_t value) { - printf(" "); - mp_obj_print(name_o, PRINT_STR); - printf(" -- "); - mp_obj_print(value, PRINT_STR); - printf("\n"); -} - STATIC mp_obj_t pyb_help(uint n_args, const mp_obj_t *args) { if (n_args == 0) { // print a general help message @@ -85,32 +77,7 @@ STATIC mp_obj_t pyb_help(uint n_args, const mp_obj_t *args) { } else { // try to print something sensible about the given object - - printf("object "); - mp_obj_print(args[0], PRINT_STR); - printf(" is of type %s\n", mp_obj_get_type_str(args[0])); - - mp_map_t *map = NULL; - if (MP_OBJ_IS_TYPE(args[0], &mp_type_module)) { - map = mp_obj_dict_get_map(mp_obj_module_get_globals(args[0])); - } else { - mp_obj_type_t *type; - if (MP_OBJ_IS_TYPE(args[0], &mp_type_type)) { - type = args[0]; - } else { - type = mp_obj_get_type(args[0]); - } - if (type->locals_dict != MP_OBJ_NULL && MP_OBJ_IS_TYPE(type->locals_dict, &mp_type_dict)) { - map = mp_obj_dict_get_map(type->locals_dict); - } - } - if (map != NULL) { - for (uint i = 0; i < map->alloc; i++) { - if (map->table[i].key != MP_OBJ_NULL) { - pyb_help_print_info_about_object(map->table[i].key, map->table[i].value); - } - } - } + pyhelp_print_obj(args[0]); } return mp_const_none; |