diff options
62 files changed, 12 insertions, 66 deletions
diff --git a/cc3200/mods/modmachine.c b/cc3200/mods/modmachine.c index 410d5b944c..f82decda2c 100644 --- a/cc3200/mods/modmachine.c +++ b/cc3200/mods/modmachine.c @@ -213,6 +213,5 @@ STATIC MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table const mp_obj_module_t machine_module = { .base = { &mp_type_module }, - .name = MP_QSTR_umachine, .globals = (mp_obj_dict_t*)&machine_module_globals, }; diff --git a/cc3200/mods/modnetwork.c b/cc3200/mods/modnetwork.c index 5891f718b3..8e086b1d29 100644 --- a/cc3200/mods/modnetwork.c +++ b/cc3200/mods/modnetwork.c @@ -161,7 +161,6 @@ STATIC MP_DEFINE_CONST_DICT(mp_module_network_globals, mp_module_network_globals const mp_obj_module_t mp_module_network = { .base = { &mp_type_module }, - .name = MP_QSTR_network, .globals = (mp_obj_dict_t*)&mp_module_network_globals, }; diff --git a/cc3200/mods/modubinascii.c b/cc3200/mods/modubinascii.c index add46f91ba..09f4b1e101 100644 --- a/cc3200/mods/modubinascii.c +++ b/cc3200/mods/modubinascii.c @@ -58,6 +58,5 @@ STATIC MP_DEFINE_CONST_DICT(mp_module_binascii_globals, mp_module_binascii_globa const mp_obj_module_t mp_module_ubinascii = { .base = { &mp_type_module }, - .name = MP_QSTR_ubinascii, .globals = (mp_obj_dict_t*)&mp_module_binascii_globals, }; diff --git a/cc3200/mods/moduhashlib.c b/cc3200/mods/moduhashlib.c index 78577f524b..93f15540c9 100644 --- a/cc3200/mods/moduhashlib.c +++ b/cc3200/mods/moduhashlib.c @@ -204,7 +204,6 @@ STATIC MP_DEFINE_CONST_DICT(mp_module_hashlib_globals, mp_module_hashlib_globals const mp_obj_module_t mp_module_uhashlib = { .base = { &mp_type_module }, - .name = MP_QSTR_uhashlib, .globals = (mp_obj_dict_t*)&mp_module_hashlib_globals, }; diff --git a/cc3200/mods/moduos.c b/cc3200/mods/moduos.c index 9538b679e2..8e3e0135ec 100644 --- a/cc3200/mods/moduos.c +++ b/cc3200/mods/moduos.c @@ -602,6 +602,5 @@ STATIC MP_DEFINE_CONST_DICT(os_module_globals, os_module_globals_table); const mp_obj_module_t mp_module_uos = { .base = { &mp_type_module }, - .name = MP_QSTR_uos, .globals = (mp_obj_dict_t*)&os_module_globals, }; diff --git a/cc3200/mods/modusocket.c b/cc3200/mods/modusocket.c index 360d034875..c7b3fb2035 100644 --- a/cc3200/mods/modusocket.c +++ b/cc3200/mods/modusocket.c @@ -541,6 +541,5 @@ STATIC MP_DEFINE_CONST_DICT(mp_module_usocket_globals, mp_module_usocket_globals const mp_obj_module_t mp_module_usocket = { .base = { &mp_type_module }, - .name = MP_QSTR_usocket, .globals = (mp_obj_dict_t*)&mp_module_usocket_globals, }; diff --git a/cc3200/mods/modussl.c b/cc3200/mods/modussl.c index 8342306bf7..1ae45d632d 100644 --- a/cc3200/mods/modussl.c +++ b/cc3200/mods/modussl.c @@ -152,7 +152,6 @@ STATIC MP_DEFINE_CONST_DICT(mp_module_ussl_globals, mp_module_ussl_globals_table const mp_obj_module_t mp_module_ussl = { .base = { &mp_type_module }, - .name = MP_QSTR_ussl, .globals = (mp_obj_dict_t*)&mp_module_ussl_globals, }; diff --git a/cc3200/mods/modutime.c b/cc3200/mods/modutime.c index c669d32a51..bef8b667f3 100644 --- a/cc3200/mods/modutime.c +++ b/cc3200/mods/modutime.c @@ -196,6 +196,5 @@ STATIC MP_DEFINE_CONST_DICT(time_module_globals, time_module_globals_table); const mp_obj_module_t mp_module_utime = { .base = { &mp_type_module }, - .name = MP_QSTR_utime, .globals = (mp_obj_dict_t*)&time_module_globals, }; diff --git a/cc3200/mods/modwipy.c b/cc3200/mods/modwipy.c index 2cfd640b08..b4c18d1530 100644 --- a/cc3200/mods/modwipy.c +++ b/cc3200/mods/modwipy.c @@ -26,6 +26,5 @@ STATIC MP_DEFINE_CONST_DICT(wipy_module_globals, wipy_module_globals_table); const mp_obj_module_t wipy_module = { .base = { &mp_type_module }, - .name = MP_QSTR_wipy, .globals = (mp_obj_dict_t*)&wipy_module_globals, }; diff --git a/esp8266/modesp.c b/esp8266/modesp.c index 39cc514afc..9a7d4ad18f 100644 --- a/esp8266/modesp.c +++ b/esp8266/modesp.c @@ -748,6 +748,5 @@ STATIC MP_DEFINE_CONST_DICT(esp_module_globals, esp_module_globals_table); const mp_obj_module_t esp_module = { .base = { &mp_type_module }, - .name = MP_QSTR_esp, .globals = (mp_obj_dict_t*)&esp_module_globals, }; diff --git a/esp8266/modmachine.c b/esp8266/modmachine.c index b0b7f3a1a3..8a81cba53a 100644 --- a/esp8266/modmachine.c +++ b/esp8266/modmachine.c @@ -271,7 +271,6 @@ STATIC MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table const mp_obj_module_t mp_module_machine = { .base = { &mp_type_module }, - .name = MP_QSTR_umachine, .globals = (mp_obj_dict_t*)&machine_module_globals, }; diff --git a/esp8266/modnetwork.c b/esp8266/modnetwork.c index 7031197fa5..86bf27ca66 100644 --- a/esp8266/modnetwork.c +++ b/esp8266/modnetwork.c @@ -484,6 +484,5 @@ STATIC MP_DEFINE_CONST_DICT(mp_module_network_globals, mp_module_network_globals const mp_obj_module_t network_module = { .base = { &mp_type_module }, - .name = MP_QSTR_network, .globals = (mp_obj_dict_t*)&mp_module_network_globals, }; diff --git a/esp8266/modonewire.c b/esp8266/modonewire.c index 0fcf1ab6a6..0d8958ceee 100644 --- a/esp8266/modonewire.c +++ b/esp8266/modonewire.c @@ -117,6 +117,5 @@ STATIC MP_DEFINE_CONST_DICT(onewire_module_globals, onewire_module_globals_table const mp_obj_module_t onewire_module = { .base = { &mp_type_module }, - .name = MP_QSTR_onewire, .globals = (mp_obj_dict_t*)&onewire_module_globals, }; diff --git a/esp8266/moduos.c b/esp8266/moduos.c index bbbf2b6b8b..cf655511d2 100644 --- a/esp8266/moduos.c +++ b/esp8266/moduos.c @@ -178,6 +178,5 @@ STATIC MP_DEFINE_CONST_DICT(os_module_globals, os_module_globals_table); const mp_obj_module_t uos_module = { .base = { &mp_type_module }, - .name = MP_QSTR_uos, .globals = (mp_obj_dict_t*)&os_module_globals, }; diff --git a/esp8266/modutime.c b/esp8266/modutime.c index bf56feb5ce..4b94ace74c 100644 --- a/esp8266/modutime.c +++ b/esp8266/modutime.c @@ -173,6 +173,5 @@ STATIC MP_DEFINE_CONST_DICT(time_module_globals, time_module_globals_table); const mp_obj_module_t utime_module = { .base = { &mp_type_module }, - .name = MP_QSTR_utime, .globals = (mp_obj_dict_t*)&time_module_globals, }; diff --git a/extmod/modbtree.c b/extmod/modbtree.c index ea2ea582c8..0f9ae82707 100644 --- a/extmod/modbtree.c +++ b/extmod/modbtree.c @@ -387,7 +387,6 @@ STATIC MP_DEFINE_CONST_DICT(mp_module_btree_globals, mp_module_btree_globals_tab const mp_obj_module_t mp_module_btree = { .base = { &mp_type_module }, - .name = MP_QSTR_btree, .globals = (mp_obj_dict_t*)&mp_module_btree_globals, }; diff --git a/extmod/modframebuf.c b/extmod/modframebuf.c index 3c884c6898..cd7f1c5e4b 100644 --- a/extmod/modframebuf.c +++ b/extmod/modframebuf.c @@ -213,7 +213,6 @@ STATIC MP_DEFINE_CONST_DICT(framebuf_module_globals, framebuf_module_globals_tab const mp_obj_module_t mp_module_framebuf = { .base = { &mp_type_module }, - .name = MP_QSTR_framebuf, .globals = (mp_obj_dict_t*)&framebuf_module_globals, }; diff --git a/extmod/modlwip.c b/extmod/modlwip.c index 80df662647..ec37919e65 100644 --- a/extmod/modlwip.c +++ b/extmod/modlwip.c @@ -1309,7 +1309,6 @@ STATIC MP_DEFINE_CONST_DICT(mp_module_lwip_globals, mp_module_lwip_globals_table const mp_obj_module_t mp_module_lwip = { .base = { &mp_type_module }, - .name = MP_QSTR_lwip, .globals = (mp_obj_dict_t*)&mp_module_lwip_globals, }; diff --git a/extmod/modubinascii.c b/extmod/modubinascii.c index 562c754b52..2b59b1a1f7 100644 --- a/extmod/modubinascii.c +++ b/extmod/modubinascii.c @@ -232,7 +232,6 @@ STATIC MP_DEFINE_CONST_DICT(mp_module_binascii_globals, mp_module_binascii_globa const mp_obj_module_t mp_module_ubinascii = { .base = { &mp_type_module }, - .name = MP_QSTR_ubinascii, .globals = (mp_obj_dict_t*)&mp_module_binascii_globals, }; diff --git a/extmod/moductypes.c b/extmod/moductypes.c index a3071af987..9995f637b8 100644 --- a/extmod/moductypes.c +++ b/extmod/moductypes.c @@ -710,7 +710,6 @@ STATIC MP_DEFINE_CONST_DICT(mp_module_uctypes_globals, mp_module_uctypes_globals const mp_obj_module_t mp_module_uctypes = { .base = { &mp_type_module }, - .name = MP_QSTR_uctypes, .globals = (mp_obj_dict_t*)&mp_module_uctypes_globals, }; diff --git a/extmod/moduhashlib.c b/extmod/moduhashlib.c index 6cd690a676..13525cc3fa 100644 --- a/extmod/moduhashlib.c +++ b/extmod/moduhashlib.c @@ -151,7 +151,6 @@ STATIC MP_DEFINE_CONST_DICT(mp_module_hashlib_globals, mp_module_hashlib_globals const mp_obj_module_t mp_module_uhashlib = { .base = { &mp_type_module }, - .name = MP_QSTR_uhashlib, .globals = (mp_obj_dict_t*)&mp_module_hashlib_globals, }; diff --git a/extmod/moduheapq.c b/extmod/moduheapq.c index 84ffe54f98..567ee83da6 100644 --- a/extmod/moduheapq.c +++ b/extmod/moduheapq.c @@ -116,7 +116,6 @@ STATIC MP_DEFINE_CONST_DICT(mp_module_uheapq_globals, mp_module_uheapq_globals_t const mp_obj_module_t mp_module_uheapq = { .base = { &mp_type_module }, - .name = MP_QSTR_uheapq, .globals = (mp_obj_dict_t*)&mp_module_uheapq_globals, }; diff --git a/extmod/modujson.c b/extmod/modujson.c index 4e080c9756..0d0781e063 100644 --- a/extmod/modujson.c +++ b/extmod/modujson.c @@ -260,7 +260,6 @@ STATIC MP_DEFINE_CONST_DICT(mp_module_ujson_globals, mp_module_ujson_globals_tab const mp_obj_module_t mp_module_ujson = { .base = { &mp_type_module }, - .name = MP_QSTR_ujson, .globals = (mp_obj_dict_t*)&mp_module_ujson_globals, }; diff --git a/extmod/modurandom.c b/extmod/modurandom.c index 27d7177207..995b0a2665 100644 --- a/extmod/modurandom.c +++ b/extmod/modurandom.c @@ -215,7 +215,6 @@ STATIC MP_DEFINE_CONST_DICT(mp_module_urandom_globals, mp_module_urandom_globals const mp_obj_module_t mp_module_urandom = { .base = { &mp_type_module }, - .name = MP_QSTR_urandom, .globals = (mp_obj_dict_t*)&mp_module_urandom_globals, }; diff --git a/extmod/modure.c b/extmod/modure.c index 9821e235a6..b8c242429b 100644 --- a/extmod/modure.c +++ b/extmod/modure.c @@ -237,7 +237,6 @@ STATIC MP_DEFINE_CONST_DICT(mp_module_re_globals, mp_module_re_globals_table); const mp_obj_module_t mp_module_ure = { .base = { &mp_type_module }, - .name = MP_QSTR_ure, .globals = (mp_obj_dict_t*)&mp_module_re_globals, }; diff --git a/extmod/modussl_axtls.c b/extmod/modussl_axtls.c index ce86263c2c..775474e6a6 100644 --- a/extmod/modussl_axtls.c +++ b/extmod/modussl_axtls.c @@ -196,7 +196,6 @@ STATIC MP_DEFINE_CONST_DICT(mp_module_ssl_globals, mp_module_ssl_globals_table); const mp_obj_module_t mp_module_ussl = { .base = { &mp_type_module }, - .name = MP_QSTR_ussl, .globals = (mp_obj_dict_t*)&mp_module_ssl_globals, }; diff --git a/extmod/moduzlib.c b/extmod/moduzlib.c index 65cbc5eb01..68a087bc1c 100644 --- a/extmod/moduzlib.c +++ b/extmod/moduzlib.c @@ -204,7 +204,6 @@ STATIC MP_DEFINE_CONST_DICT(mp_module_uzlib_globals, mp_module_uzlib_globals_tab const mp_obj_module_t mp_module_uzlib = { .base = { &mp_type_module }, - .name = MP_QSTR_uzlib, .globals = (mp_obj_dict_t*)&mp_module_uzlib_globals, }; diff --git a/extmod/modwebrepl.c b/extmod/modwebrepl.c index 858d2c1c0b..8e05809662 100644 --- a/extmod/modwebrepl.c +++ b/extmod/modwebrepl.c @@ -340,7 +340,7 @@ STATIC const mp_obj_type_t webrepl_type = { }; STATIC const mp_map_elem_t webrepl_module_globals_table[] = { - { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_websocket) }, + { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR__webrepl) }, { MP_OBJ_NEW_QSTR(MP_QSTR__webrepl), (mp_obj_t)&webrepl_type }, { MP_OBJ_NEW_QSTR(MP_QSTR_password), (mp_obj_t)&webrepl_set_password_obj }, }; @@ -349,7 +349,6 @@ STATIC MP_DEFINE_CONST_DICT(webrepl_module_globals, webrepl_module_globals_table const mp_obj_module_t mp_module_webrepl = { .base = { &mp_type_module }, - .name = MP_QSTR__webrepl, .globals = (mp_obj_dict_t*)&webrepl_module_globals, }; diff --git a/extmod/modwebsocket.c b/extmod/modwebsocket.c index f46dac1773..8200ea708a 100644 --- a/extmod/modwebsocket.c +++ b/extmod/modwebsocket.c @@ -313,7 +313,6 @@ STATIC MP_DEFINE_CONST_DICT(websocket_module_globals, websocket_module_globals_t const mp_obj_module_t mp_module_websocket = { .base = { &mp_type_module }, - .name = MP_QSTR_websocket, .globals = (mp_obj_dict_t*)&websocket_module_globals, }; diff --git a/pic16bit/modpyb.c b/pic16bit/modpyb.c index f59163a697..326d37f8a1 100644 --- a/pic16bit/modpyb.c +++ b/pic16bit/modpyb.c @@ -66,6 +66,5 @@ STATIC MP_DEFINE_CONST_DICT(pyb_module_globals, pyb_module_globals_table); const mp_obj_module_t pyb_module = { .base = { &mp_type_module }, - .name = MP_QSTR_pyb, .globals = (mp_obj_dict_t*)&pyb_module_globals, }; diff --git a/py/modarray.c b/py/modarray.c index cfee011e10..356e48bee0 100644 --- a/py/modarray.c +++ b/py/modarray.c @@ -37,7 +37,6 @@ STATIC MP_DEFINE_CONST_DICT(mp_module_array_globals, mp_module_array_globals_tab const mp_obj_module_t mp_module_array = { .base = { &mp_type_module }, - .name = MP_QSTR_array, .globals = (mp_obj_dict_t*)&mp_module_array_globals, }; diff --git a/py/modbuiltins.c b/py/modbuiltins.c index ac3d3041f5..29f84d6c25 100644 --- a/py/modbuiltins.c +++ b/py/modbuiltins.c @@ -577,6 +577,8 @@ MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_id_obj, mp_obj_id); MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_len_obj, mp_obj_len); STATIC const mp_rom_map_elem_t mp_module_builtins_globals_table[] = { + { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_builtins) }, + // built-in core functions { MP_ROM_QSTR(MP_QSTR___build_class__), MP_ROM_PTR(&mp_builtin___build_class___obj) }, { MP_ROM_QSTR(MP_QSTR___import__), MP_ROM_PTR(&mp_builtin___import___obj) }, @@ -727,6 +729,5 @@ MP_DEFINE_CONST_DICT(mp_module_builtins_globals, mp_module_builtins_globals_tabl const mp_obj_module_t mp_module_builtins = { .base = { &mp_type_module }, - .name = MP_QSTR_builtins, .globals = (mp_obj_dict_t*)&mp_module_builtins_globals, }; diff --git a/py/modcmath.c b/py/modcmath.c index 33fe9c73f5..7ad8f5ad60 100644 --- a/py/modcmath.c +++ b/py/modcmath.c @@ -160,7 +160,6 @@ STATIC MP_DEFINE_CONST_DICT(mp_module_cmath_globals, mp_module_cmath_globals_tab const mp_obj_module_t mp_module_cmath = { .base = { &mp_type_module }, - .name = MP_QSTR_cmath, .globals = (mp_obj_dict_t*)&mp_module_cmath_globals, }; diff --git a/py/modcollections.c b/py/modcollections.c index dceaa203de..e610a28d24 100644 --- a/py/modcollections.c +++ b/py/modcollections.c @@ -40,7 +40,6 @@ STATIC MP_DEFINE_CONST_DICT(mp_module_collections_globals, mp_module_collections const mp_obj_module_t mp_module_collections = { .base = { &mp_type_module }, - .name = MP_QSTR_ucollections, .globals = (mp_obj_dict_t*)&mp_module_collections_globals, }; diff --git a/py/modgc.c b/py/modgc.c index 976fb89980..24564622ec 100644 --- a/py/modgc.c +++ b/py/modgc.c @@ -119,7 +119,6 @@ STATIC MP_DEFINE_CONST_DICT(mp_module_gc_globals, mp_module_gc_globals_table); const mp_obj_module_t mp_module_gc = { .base = { &mp_type_module }, - .name = MP_QSTR_gc, .globals = (mp_obj_dict_t*)&mp_module_gc_globals, }; diff --git a/py/modio.c b/py/modio.c index f8826c71a7..2a38af602e 100644 --- a/py/modio.c +++ b/py/modio.c @@ -153,7 +153,6 @@ STATIC MP_DEFINE_CONST_DICT(mp_module_io_globals, mp_module_io_globals_table); const mp_obj_module_t mp_module_io = { .base = { &mp_type_module }, - .name = MP_QSTR_uio, .globals = (mp_obj_dict_t*)&mp_module_io_globals, }; diff --git a/py/modmath.c b/py/modmath.c index 54262f6115..0c70f34cd1 100644 --- a/py/modmath.c +++ b/py/modmath.c @@ -268,7 +268,6 @@ STATIC MP_DEFINE_CONST_DICT(mp_module_math_globals, mp_module_math_globals_table const mp_obj_module_t mp_module_math = { .base = { &mp_type_module }, - .name = MP_QSTR_math, .globals = (mp_obj_dict_t*)&mp_module_math_globals, }; diff --git a/py/modmicropython.c b/py/modmicropython.c index 805bda51d2..31ae7025fe 100644 --- a/py/modmicropython.c +++ b/py/modmicropython.c @@ -145,6 +145,5 @@ STATIC MP_DEFINE_CONST_DICT(mp_module_micropython_globals, mp_module_micropython const mp_obj_module_t mp_module_micropython = { .base = { &mp_type_module }, - .name = MP_QSTR_micropython, .globals = (mp_obj_dict_t*)&mp_module_micropython_globals, }; diff --git a/py/modstruct.c b/py/modstruct.c index be0d0110de..5c07b8102a 100644 --- a/py/modstruct.c +++ b/py/modstruct.c @@ -265,7 +265,6 @@ STATIC MP_DEFINE_CONST_DICT(mp_module_struct_globals, mp_module_struct_globals_t const mp_obj_module_t mp_module_ustruct = { .base = { &mp_type_module }, - .name = MP_QSTR_ustruct, .globals = (mp_obj_dict_t*)&mp_module_struct_globals, }; diff --git a/py/modsys.c b/py/modsys.c index 3bc5c2bafc..8c368ac35b 100644 --- a/py/modsys.c +++ b/py/modsys.c @@ -203,7 +203,6 @@ STATIC MP_DEFINE_CONST_DICT(mp_module_sys_globals, mp_module_sys_globals_table); const mp_obj_module_t mp_module_sys = { .base = { &mp_type_module }, - .name = MP_QSTR_sys, .globals = (mp_obj_dict_t*)&mp_module_sys_globals, }; diff --git a/py/modthread.c b/py/modthread.c index 6c8340c928..24b94f1c84 100644 --- a/py/modthread.c +++ b/py/modthread.c @@ -294,7 +294,6 @@ STATIC MP_DEFINE_CONST_DICT(mp_module_thread_globals, mp_module_thread_globals_t const mp_obj_module_t mp_module_thread = { .base = { &mp_type_module }, - .name = MP_QSTR__thread, .globals = (mp_obj_dict_t*)&mp_module_thread_globals, }; diff --git a/py/moduerrno.c b/py/moduerrno.c index 343b29ba08..4a5e87419f 100644 --- a/py/moduerrno.c +++ b/py/moduerrno.c @@ -89,7 +89,6 @@ STATIC MP_DEFINE_CONST_DICT(mp_module_uerrno_globals, mp_module_uerrno_globals_t const mp_obj_module_t mp_module_uerrno = { .base = { &mp_type_module }, - .name = MP_QSTR_uerrno, .globals = (mp_obj_dict_t*)&mp_module_uerrno_globals, }; @@ -765,7 +765,6 @@ MP_DECLARE_CONST_FUN_OBJ(mp_identity_obj); // module typedef struct _mp_obj_module_t { mp_obj_base_t base; - qstr name; mp_obj_dict_t *globals; } mp_obj_module_t; mp_obj_dict_t *mp_obj_module_get_globals(mp_obj_t self_in); diff --git a/py/objmodule.c b/py/objmodule.c index dc2ce787b4..9b06e3b7b5 100644 --- a/py/objmodule.c +++ b/py/objmodule.c @@ -37,17 +37,23 @@ STATIC void module_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kin (void)kind; mp_obj_module_t *self = MP_OBJ_TO_PTR(self_in); + const char *module_name = ""; + mp_map_elem_t *elem = mp_map_lookup(&self->globals->map, MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_MAP_LOOKUP); + if (elem != NULL) { + module_name = mp_obj_str_get_str(elem->value); + } + #if MICROPY_PY___FILE__ // If we store __file__ to imported modules then try to lookup this // symbol to give more information about the module. - mp_map_elem_t *elem = mp_map_lookup(&self->globals->map, MP_OBJ_NEW_QSTR(MP_QSTR___file__), MP_MAP_LOOKUP); + elem = mp_map_lookup(&self->globals->map, MP_OBJ_NEW_QSTR(MP_QSTR___file__), MP_MAP_LOOKUP); if (elem != NULL) { - mp_printf(print, "<module '%q' from '%s'>", self->name, mp_obj_str_get_str(elem->value)); + mp_printf(print, "<module '%s' from '%s'>", module_name, mp_obj_str_get_str(elem->value)); return; } #endif - mp_printf(print, "<module '%q'>", self->name); + mp_printf(print, "<module '%s'>", module_name); } STATIC void module_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) { @@ -106,7 +112,6 @@ mp_obj_t mp_obj_new_module(qstr module_name) { // create new module object mp_obj_module_t *o = m_new_obj(mp_obj_module_t); o->base.type = &mp_type_module; - o->name = module_name; o->globals = MP_OBJ_TO_PTR(mp_obj_new_dict(MICROPY_MODULE_DICT_SIZE)); // store __name__ entry in the module diff --git a/py/runtime.c b/py/runtime.c index 48e815f0fa..c3e187d8a5 100644 --- a/py/runtime.c +++ b/py/runtime.c @@ -55,7 +55,6 @@ const mp_obj_module_t mp_module___main__ = { .base = { &mp_type_module }, - .name = MP_QSTR___main__, .globals = (mp_obj_dict_t*)&MP_STATE_VM(dict_main), }; diff --git a/stmhal/modmachine.c b/stmhal/modmachine.c index ca17eff807..c5f33146f7 100644 --- a/stmhal/modmachine.c +++ b/stmhal/modmachine.c @@ -559,7 +559,6 @@ STATIC MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table const mp_obj_module_t machine_module = { .base = { &mp_type_module }, - .name = MP_QSTR_umachine, .globals = (mp_obj_dict_t*)&machine_module_globals, }; diff --git a/stmhal/modnetwork.c b/stmhal/modnetwork.c index 4425461a07..1ea224cbfc 100644 --- a/stmhal/modnetwork.c +++ b/stmhal/modnetwork.c @@ -86,6 +86,5 @@ STATIC MP_DEFINE_CONST_DICT(mp_module_network_globals, mp_module_network_globals const mp_obj_module_t mp_module_network = { .base = { &mp_type_module }, - .name = MP_QSTR_network, .globals = (mp_obj_dict_t*)&mp_module_network_globals, }; diff --git a/stmhal/modpyb.c b/stmhal/modpyb.c index 209d0fb4a4..17c3411ebb 100644 --- a/stmhal/modpyb.c +++ b/stmhal/modpyb.c @@ -229,6 +229,5 @@ STATIC MP_DEFINE_CONST_DICT(pyb_module_globals, pyb_module_globals_table); const mp_obj_module_t pyb_module = { .base = { &mp_type_module }, - .name = MP_QSTR_pyb, .globals = (mp_obj_dict_t*)&pyb_module_globals, }; diff --git a/stmhal/modstm.c b/stmhal/modstm.c index 005cd824ae..76c8eb155a 100644 --- a/stmhal/modstm.c +++ b/stmhal/modstm.c @@ -51,6 +51,5 @@ STATIC MP_DEFINE_CONST_DICT(stm_module_globals, stm_module_globals_table); const mp_obj_module_t stm_module = { .base = { &mp_type_module }, - .name = MP_QSTR_stm, .globals = (mp_obj_dict_t*)&stm_module_globals, }; diff --git a/stmhal/moduos.c b/stmhal/moduos.c index 52d0a58425..0a369ef380 100644 --- a/stmhal/moduos.c +++ b/stmhal/moduos.c @@ -407,6 +407,5 @@ STATIC MP_DEFINE_CONST_DICT(os_module_globals, os_module_globals_table); const mp_obj_module_t mp_module_uos = { .base = { &mp_type_module }, - .name = MP_QSTR_uos, .globals = (mp_obj_dict_t*)&os_module_globals, }; diff --git a/stmhal/moduselect.c b/stmhal/moduselect.c index 92e77e6ca8..2dcac7fdec 100644 --- a/stmhal/moduselect.c +++ b/stmhal/moduselect.c @@ -307,6 +307,5 @@ STATIC MP_DEFINE_CONST_DICT(mp_module_select_globals, mp_module_select_globals_t const mp_obj_module_t mp_module_uselect = { .base = { &mp_type_module }, - .name = MP_QSTR_uselect, .globals = (mp_obj_dict_t*)&mp_module_select_globals, }; diff --git a/stmhal/modusocket.c b/stmhal/modusocket.c index c0e30ce050..36f149c450 100644 --- a/stmhal/modusocket.c +++ b/stmhal/modusocket.c @@ -444,6 +444,5 @@ STATIC MP_DEFINE_CONST_DICT(mp_module_usocket_globals, mp_module_usocket_globals const mp_obj_module_t mp_module_usocket = { .base = { &mp_type_module }, - .name = MP_QSTR_usocket, .globals = (mp_obj_dict_t*)&mp_module_usocket_globals, }; diff --git a/stmhal/modutime.c b/stmhal/modutime.c index 8502e0fd62..60c92d60c1 100644 --- a/stmhal/modutime.c +++ b/stmhal/modutime.c @@ -213,6 +213,5 @@ STATIC MP_DEFINE_CONST_DICT(time_module_globals, time_module_globals_table); const mp_obj_module_t mp_module_utime = { .base = { &mp_type_module }, - .name = MP_QSTR_utime, .globals = (mp_obj_dict_t*)&time_module_globals, }; diff --git a/teensy/modpyb.c b/teensy/modpyb.c index aa62f78703..0eb2a7b517 100644 --- a/teensy/modpyb.c +++ b/teensy/modpyb.c @@ -354,6 +354,5 @@ STATIC MP_DEFINE_CONST_DICT(pyb_module_globals, pyb_module_globals_table); const mp_obj_module_t pyb_module = { .base = { &mp_type_module }, - .name = MP_QSTR_pyb, .globals = (mp_obj_dict_t*)&pyb_module_globals, }; diff --git a/unix/modffi.c b/unix/modffi.c index ba7141d242..71c6b573f8 100644 --- a/unix/modffi.c +++ b/unix/modffi.c @@ -499,6 +499,5 @@ STATIC MP_DEFINE_CONST_DICT(mp_module_ffi_globals, mp_module_ffi_globals_table); const mp_obj_module_t mp_module_ffi = { .base = { &mp_type_module }, - .name = MP_QSTR_ffi, .globals = (mp_obj_dict_t*)&mp_module_ffi_globals, }; diff --git a/unix/modjni.c b/unix/modjni.c index c06e68eaa5..b54da8b15a 100644 --- a/unix/modjni.c +++ b/unix/modjni.c @@ -718,6 +718,5 @@ STATIC MP_DEFINE_CONST_DICT(mp_module_jni_globals, mp_module_jni_globals_table); const mp_obj_module_t mp_module_jni = { .base = { &mp_type_module }, - .name = MP_QSTR_jni, .globals = (mp_obj_dict_t*)&mp_module_jni_globals, }; diff --git a/unix/modmachine.c b/unix/modmachine.c index 166d47712d..1b62b68c34 100644 --- a/unix/modmachine.c +++ b/unix/modmachine.c @@ -91,7 +91,6 @@ STATIC MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table const mp_obj_module_t mp_module_machine = { .base = { &mp_type_module }, - .name = MP_QSTR_umachine, .globals = (mp_obj_dict_t*)&machine_module_globals, }; diff --git a/unix/modos.c b/unix/modos.c index 0e699ec1d6..833d69b236 100644 --- a/unix/modos.c +++ b/unix/modos.c @@ -253,6 +253,5 @@ STATIC MP_DEFINE_CONST_DICT(mp_module_os_globals, mp_module_os_globals_table); const mp_obj_module_t mp_module_os = { .base = { &mp_type_module }, - .name = MP_QSTR_uos, .globals = (mp_obj_dict_t*)&mp_module_os_globals, }; diff --git a/unix/modsocket.c b/unix/modsocket.c index 56bab3494a..bc1531caea 100644 --- a/unix/modsocket.c +++ b/unix/modsocket.c @@ -586,6 +586,5 @@ STATIC MP_DEFINE_CONST_DICT(mp_module_socket_globals, mp_module_socket_globals_t const mp_obj_module_t mp_module_socket = { .base = { &mp_type_module }, - .name = MP_QSTR_usocket, .globals = (mp_obj_dict_t*)&mp_module_socket_globals, }; diff --git a/unix/modtermios.c b/unix/modtermios.c index 38be729e22..20f824a7f5 100644 --- a/unix/modtermios.c +++ b/unix/modtermios.c @@ -151,6 +151,5 @@ STATIC MP_DEFINE_CONST_DICT(mp_module_termios_globals, mp_module_termios_globals const mp_obj_module_t mp_module_termios = { .base = { &mp_type_module }, - .name = MP_QSTR_termios, .globals = (mp_obj_dict_t*)&mp_module_termios_globals, }; diff --git a/unix/modtime.c b/unix/modtime.c index 6843238cf3..8d6d9f4d7e 100644 --- a/unix/modtime.c +++ b/unix/modtime.c @@ -198,7 +198,6 @@ STATIC MP_DEFINE_CONST_DICT(mp_module_time_globals, mp_module_time_globals_table const mp_obj_module_t mp_module_time = { .base = { &mp_type_module }, - .name = MP_QSTR_utime, .globals = (mp_obj_dict_t*)&mp_module_time_globals, }; diff --git a/unix/moduselect.c b/unix/moduselect.c index e670c38144..ae603b36a5 100644 --- a/unix/moduselect.c +++ b/unix/moduselect.c @@ -235,7 +235,6 @@ STATIC MP_DEFINE_CONST_DICT(mp_module_select_globals, mp_module_select_globals_t const mp_obj_module_t mp_module_uselect = { .base = { &mp_type_module }, - .name = MP_QSTR_uselect, .globals = (mp_obj_dict_t*)&mp_module_select_globals, }; |