Skip to content

Commit 30628d1

Browse files
jimmojimmo
committed
all: Rename MP_QSTR_umodule to MP_QSTR_module everywhere.
This renames the builtin-modules, such that help('modules') and printing the module object will show "module" rather than "umodule". This work was funded through GitHub Sponsors. Signed-off-by: Jim Mussared <[email protected]>
1 parent d080d42 commit 30628d1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+111
-111
lines changed

‎examples/natmod/uheapq/uheapq.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *args) {
88
MP_DYNRUNTIME_INIT_ENTRY
99

10-
mp_store_global(MP_QSTR___name__, MP_OBJ_NEW_QSTR(MP_QSTR_uheapq));
10+
mp_store_global(MP_QSTR___name__, MP_OBJ_NEW_QSTR(MP_QSTR_heapq));
1111
mp_store_global(MP_QSTR_heappush, MP_OBJ_FROM_PTR(&mod_uheapq_heappush_obj));
1212
mp_store_global(MP_QSTR_heappop, MP_OBJ_FROM_PTR(&mod_uheapq_heappop_obj));
1313
mp_store_global(MP_QSTR_heapify, MP_OBJ_FROM_PTR(&mod_uheapq_heapify_obj));

‎examples/natmod/urandom/urandom.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *a
1616
yasmarang_n = 69;
1717
yasmarang_d = 233;
1818

19-
mp_store_global(MP_QSTR___name__, MP_OBJ_NEW_QSTR(MP_QSTR_urandom));
19+
mp_store_global(MP_QSTR___name__, MP_OBJ_NEW_QSTR(MP_QSTR_random));
2020
mp_store_global(MP_QSTR_getrandbits, MP_OBJ_FROM_PTR(&mod_urandom_getrandbits_obj));
2121
mp_store_global(MP_QSTR_seed, MP_OBJ_FROM_PTR(&mod_urandom_seed_obj));
2222
#if MICROPY_PY_URANDOM_EXTRA_FUNCS

‎examples/natmod/ure/ure.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *a
6363
MP_OBJ_TYPE_SET_SLOT(&match_type, locals_dict, (void*)&match_locals_dict, 1);
6464

6565
re_type.base.type = (void*)&mp_fun_table.type_type;
66-
re_type.name = MP_QSTR_ure;
66+
re_type.name = MP_QSTR_re;
6767
MP_OBJ_TYPE_SET_SLOT(&re_type, print, re_print, 0);
6868
re_locals_dict_table[0] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_match), MP_OBJ_FROM_PTR(&re_match_obj) };
6969
re_locals_dict_table[1] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_search), MP_OBJ_FROM_PTR(&re_search_obj) };

‎examples/natmod/uzlib/uzlib.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *a
2727
decompio_locals_dict_table[2] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_readline), MP_OBJ_FROM_PTR(&mp_stream_unbuffered_readline_obj) };
2828
MP_OBJ_TYPE_SET_SLOT(&decompio_type, locals_dict, (void*)&decompio_locals_dict, 2);
2929

30-
mp_store_global(MP_QSTR___name__, MP_OBJ_NEW_QSTR(MP_QSTR_uzlib));
30+
mp_store_global(MP_QSTR___name__, MP_OBJ_NEW_QSTR(MP_QSTR_zlib));
3131
mp_store_global(MP_QSTR_decompress, MP_OBJ_FROM_PTR(&mod_uzlib_decompress_obj));
3232
mp_store_global(MP_QSTR_DecompIO, MP_OBJ_FROM_PTR(&decompio_type));
3333

‎extmod/modbluetooth.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -985,7 +985,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
985985
);
986986

987987
STATIC const mp_rom_map_elem_t mp_module_bluetooth_globals_table[] = {
988-
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_ubluetooth) },
988+
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_bluetooth) },
989989
{ MP_ROM_QSTR(MP_QSTR_BLE), MP_ROM_PTR(&mp_type_bluetooth_ble) },
990990
{ MP_ROM_QSTR(MP_QSTR_UUID), MP_ROM_PTR(&mp_type_bluetooth_uuid) },
991991

@@ -1004,7 +1004,7 @@ const mp_obj_module_t mp_module_ubluetooth = {
10041004
.globals = (mp_obj_dict_t *)&mp_module_bluetooth_globals,
10051005
};
10061006

1007-
MP_REGISTER_MODULE(MP_QSTR_ubluetooth, mp_module_ubluetooth);
1007+
MP_REGISTER_MODULE(MP_QSTR_bluetooth, mp_module_ubluetooth);
10081008

10091009
// Helpers
10101010

‎extmod/modlwip.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1802,7 +1802,7 @@ const mp_obj_module_t mp_module_lwip = {
18021802
MP_REGISTER_MODULE(MP_QSTR_lwip, mp_module_lwip);
18031803

18041804
// On LWIP-ports, this is the usocket module (replaces extmod/modusocket.c).
1805-
MP_REGISTER_MODULE(MP_QSTR_usocket, mp_module_lwip);
1805+
MP_REGISTER_MODULE(MP_QSTR_socket, mp_module_lwip);
18061806

18071807
MP_REGISTER_ROOT_POINTER(mp_obj_t lwip_slip_stream);
18081808

‎extmod/modubinascii.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_binascii_crc32_obj, 1, 2, mod_bin
184184
#endif
185185

186186
STATIC const mp_rom_map_elem_t mp_module_binascii_globals_table[] = {
187-
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_ubinascii) },
187+
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_binascii) },
188188
#if MICROPY_PY_BUILTINS_BYTES_HEX
189189
{ MP_ROM_QSTR(MP_QSTR_hexlify), MP_ROM_PTR(&bytes_hex_as_bytes_obj) },
190190
{ MP_ROM_QSTR(MP_QSTR_unhexlify), MP_ROM_PTR(&bytes_fromhex_obj) },
@@ -203,6 +203,6 @@ const mp_obj_module_t mp_module_ubinascii = {
203203
.globals = (mp_obj_dict_t *)&mp_module_binascii_globals,
204204
};
205205

206-
MP_REGISTER_MODULE(MP_QSTR_ubinascii, mp_module_ubinascii);
206+
MP_REGISTER_MODULE(MP_QSTR_binascii, mp_module_ubinascii);
207207

208208
#endif // MICROPY_PY_UBINASCII

‎extmod/moducryptolib.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
357357
);
358358

359359
STATIC const mp_rom_map_elem_t mp_module_ucryptolib_globals_table[] = {
360-
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_ucryptolib) },
360+
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_cryptolib) },
361361
{ MP_ROM_QSTR(MP_QSTR_aes), MP_ROM_PTR(&ucryptolib_aes_type) },
362362
#if MICROPY_PY_UCRYPTOLIB_CONSTS
363363
{ MP_ROM_QSTR(MP_QSTR_MODE_ECB), MP_ROM_INT(UCRYPTOLIB_MODE_ECB) },
@@ -375,6 +375,6 @@ const mp_obj_module_t mp_module_ucryptolib = {
375375
.globals = (mp_obj_dict_t *)&mp_module_ucryptolib_globals,
376376
};
377377

378-
MP_REGISTER_MODULE(MP_QSTR_ucryptolib, mp_module_ucryptolib);
378+
MP_REGISTER_MODULE(MP_QSTR_cryptolib, mp_module_ucryptolib);
379379

380380
#endif // MICROPY_PY_UCRYPTOLIB

‎extmod/moduhashlib.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
355355
#endif // MICROPY_PY_UHASHLIB_MD5
356356

357357
STATIC const mp_rom_map_elem_t mp_module_uhashlib_globals_table[] = {
358-
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uhashlib) },
358+
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_hashlib) },
359359
#if MICROPY_PY_UHASHLIB_SHA256
360360
{ MP_ROM_QSTR(MP_QSTR_sha256), MP_ROM_PTR(&uhashlib_sha256_type) },
361361
#endif
@@ -374,6 +374,6 @@ const mp_obj_module_t mp_module_uhashlib = {
374374
.globals = (mp_obj_dict_t *)&mp_module_uhashlib_globals,
375375
};
376376

377-
MP_REGISTER_MODULE(MP_QSTR_uhashlib, mp_module_uhashlib);
377+
MP_REGISTER_MODULE(MP_QSTR_hashlib, mp_module_uhashlib);
378378

379379
#endif // MICROPY_PY_UHASHLIB

‎extmod/moduheapq.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_uheapq_heapify_obj, mod_uheapq_heapify);
105105

106106
#if !MICROPY_ENABLE_DYNRUNTIME
107107
STATIC const mp_rom_map_elem_t mp_module_uheapq_globals_table[] = {
108-
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uheapq) },
108+
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_heapq) },
109109
{ MP_ROM_QSTR(MP_QSTR_heappush), MP_ROM_PTR(&mod_uheapq_heappush_obj) },
110110
{ MP_ROM_QSTR(MP_QSTR_heappop), MP_ROM_PTR(&mod_uheapq_heappop_obj) },
111111
{ MP_ROM_QSTR(MP_QSTR_heapify), MP_ROM_PTR(&mod_uheapq_heapify_obj) },
@@ -118,7 +118,7 @@ const mp_obj_module_t mp_module_uheapq = {
118118
.globals = (mp_obj_dict_t *)&mp_module_uheapq_globals,
119119
};
120120

121-
MP_REGISTER_MODULE(MP_QSTR_uheapq, mp_module_uheapq);
121+
MP_REGISTER_MODULE(MP_QSTR_heapq, mp_module_uheapq);
122122
#endif
123123

124124
#endif // MICROPY_PY_UHEAPQ

0 commit comments

Comments
 (0)