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 <jim.mussared@gmail.com>

6 files changed, 11 insertions, 11 deletions

diff --git a/py/modarray.c b/py/modarray.c
index d9f7a0452..c91e92f79 100644
--- a/py/modarray.c
+++ b/py/modarray.c
@@ -29,7 +29,7 @@
 #if MICROPY_PY_ARRAY
 
 STATIC const mp_rom_map_elem_t mp_module_array_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uarray) },
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_array) },
     { MP_ROM_QSTR(MP_QSTR_array), MP_ROM_PTR(&mp_type_array) },
 };
 
@@ -40,6 +40,6 @@ const mp_obj_module_t mp_module_uarray = {
     .globals = (mp_obj_dict_t *)&mp_module_array_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_uarray, mp_module_uarray);
+MP_REGISTER_MODULE(MP_QSTR_array, mp_module_uarray);
 
 #endif
diff --git a/py/modcollections.c b/py/modcollections.c
index 8c62f34db..a56fe069e 100644
--- a/py/modcollections.c
+++ b/py/modcollections.c
@@ -29,7 +29,7 @@
 #if MICROPY_PY_COLLECTIONS
 
 STATIC const mp_rom_map_elem_t mp_module_collections_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_ucollections) },
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_collections) },
     #if MICROPY_PY_COLLECTIONS_DEQUE
     { MP_ROM_QSTR(MP_QSTR_deque), MP_ROM_PTR(&mp_type_deque) },
     #endif
@@ -46,6 +46,6 @@ const mp_obj_module_t mp_module_collections = {
     .globals = (mp_obj_dict_t *)&mp_module_collections_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_ucollections, mp_module_collections);
+MP_REGISTER_MODULE(MP_QSTR_collections, mp_module_collections);
 
 #endif // MICROPY_PY_COLLECTIONS
diff --git a/py/modio.c b/py/modio.c
index 9ec6bbcc4..3462611d7 100644
--- a/py/modio.c
+++ b/py/modio.c
@@ -203,7 +203,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
 #endif // MICROPY_PY_IO_BUFFEREDWRITER
 
 STATIC const mp_rom_map_elem_t mp_module_io_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uio) },
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_io) },
     // Note: mp_builtin_open_obj should be defined by port, it's not
     // part of the core.
     { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
@@ -226,6 +226,6 @@ const mp_obj_module_t mp_module_io = {
     .globals = (mp_obj_dict_t *)&mp_module_io_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_uio, mp_module_io);
+MP_REGISTER_MODULE(MP_QSTR_io, mp_module_io);
 
 #endif
diff --git a/py/modstruct.c b/py/modstruct.c
index ec86d4b9c..78c7d53e4 100644
--- a/py/modstruct.c
+++ b/py/modstruct.c
@@ -251,7 +251,7 @@ STATIC mp_obj_t struct_pack_into(size_t n_args, const mp_obj_t *args) {
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(struct_pack_into_obj, 3, MP_OBJ_FUN_ARGS_MAX, struct_pack_into);
 
 STATIC const mp_rom_map_elem_t mp_module_struct_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_ustruct) },
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_struct) },
     { MP_ROM_QSTR(MP_QSTR_calcsize), MP_ROM_PTR(&struct_calcsize_obj) },
     { MP_ROM_QSTR(MP_QSTR_pack), MP_ROM_PTR(&struct_pack_obj) },
     { MP_ROM_QSTR(MP_QSTR_pack_into), MP_ROM_PTR(&struct_pack_into_obj) },
@@ -266,6 +266,6 @@ const mp_obj_module_t mp_module_ustruct = {
     .globals = (mp_obj_dict_t *)&mp_module_struct_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_ustruct, mp_module_ustruct);
+MP_REGISTER_MODULE(MP_QSTR_struct, mp_module_ustruct);
 
 #endif
diff --git a/py/modsys.c b/py/modsys.c
index 35af761a0..09bdfefc6 100644
--- a/py/modsys.c
+++ b/py/modsys.c
@@ -294,7 +294,7 @@ const mp_obj_module_t mp_module_sys = {
     .globals = (mp_obj_dict_t *)&mp_module_sys_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_usys, mp_module_sys);
+MP_REGISTER_MODULE(MP_QSTR_sys, mp_module_sys);
 
 // If MICROPY_PY_SYS_PATH_ARGV_DEFAULTS is not enabled then these two lists
 // must be initialised after the call to mp_init.
diff --git a/py/moduerrno.c b/py/moduerrno.c
index 1b16fd9d9..e197f921e 100644
--- a/py/moduerrno.c
+++ b/py/moduerrno.c
@@ -82,7 +82,7 @@ STATIC const mp_obj_dict_t errorcode_dict = {
 #endif
 
 STATIC const mp_rom_map_elem_t mp_module_uerrno_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uerrno) },
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_errno) },
     #if MICROPY_PY_UERRNO_ERRORCODE
     { MP_ROM_QSTR(MP_QSTR_errorcode), MP_ROM_PTR(&errorcode_dict) },
     #endif
@@ -99,7 +99,7 @@ const mp_obj_module_t mp_module_uerrno = {
     .globals = (mp_obj_dict_t *)&mp_module_uerrno_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_uerrno, mp_module_uerrno);
+MP_REGISTER_MODULE(MP_QSTR_errno, mp_module_uerrno);
 
 qstr mp_errno_to_str(mp_obj_t errno_val) {
     #if MICROPY_PY_UERRNO_ERRORCODE