From 21a60935a5d5885817881b4f690fdfd3ef009100 Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Tue, 22 Oct 2019 16:35:46 +1100
Subject: [PATCH] py/modarray: Rename "array" module to "uarray".

Following the other modules like ustruct, ucollections.

See issues #4370 and #4449.
---
 py/builtin.h  | 2 +-
 py/modarray.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/py/builtin.h b/py/builtin.h
index a5e0f5f2d0..1928577be8 100644
--- a/py/builtin.h
+++ b/py/builtin.h
@@ -89,7 +89,7 @@ MP_DECLARE_CONST_FUN_OBJ_2(mp_op_delitem_obj);
 
 extern const mp_obj_module_t mp_module___main__;
 extern const mp_obj_module_t mp_module_builtins;
-extern const mp_obj_module_t mp_module_array;
+extern const mp_obj_module_t mp_module_uarray;
 extern const mp_obj_module_t mp_module_collections;
 extern const mp_obj_module_t mp_module_io;
 extern const mp_obj_module_t mp_module_math;
diff --git a/py/modarray.c b/py/modarray.c
index de84fc8587..b459a83756 100644
--- a/py/modarray.c
+++ b/py/modarray.c
@@ -29,17 +29,17 @@
 #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_array) },
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uarray) },
     { MP_ROM_QSTR(MP_QSTR_array), MP_ROM_PTR(&mp_type_array) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_array_globals, mp_module_array_globals_table);
 
-const mp_obj_module_t mp_module_array = {
+const mp_obj_module_t mp_module_uarray = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t*)&mp_module_array_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_array, mp_module_array, MICROPY_PY_ARRAY);
+MP_REGISTER_MODULE(MP_QSTR_uarray, mp_module_uarray, MICROPY_PY_ARRAY);
 
 #endif