pybricks/pybricks: Fix auto-import in REPL.

Fixes pybricks/support#741

This was broken by cd16b4c

Author: laurensvalk

CHANGELOG.md

@@ -31,6 +31,9 @@
   speed as a numerical derivative of the motor position, instead of a
   model-based estimate. For most use cases, this is a more intuitive result
   because this speed value is not affected by mechanical load.
+- When using the REPL, everything from all Pybricks modules was automatically
+  imported for convenience. Now, everything from all available MicroPython
+  modules is also automatically imported ([support#741]).
 
 ### Fixed
 - Fixed motors going out of sync when starting program ([support#679]).
@@ -40,6 +43,7 @@
 - Fixed REPL history corrupt after soft reset ([support#699]).
 - Fixed "ValueError: incompatible .mpy file" when pressing the button when
   there is no program yet ([support#599]).
+- Fixed automatic imports when using the REPL ([support#741]).
 
 [pybricks-micropython#115]: https://github.com/pybricks/pybricks-micropython/pull/115
 [support#232]: https://github.com/pybricks/support/issues/232
@@ -49,6 +53,7 @@
 [support#692]: https://github.com/pybricks/support/issues/692
 [support#699]: https://github.com/pybricks/support/issues/699
 [support#729]: https://github.com/pybricks/support/issues/729
+[support#741]: https://github.com/pybricks/support/issues/741
 
 ## [3.2.0b3] - 2022-07-20
 

pybricks/pybricks.c

@@ -62,18 +62,17 @@ MP_REGISTER_MODULE(MP_QSTR_pybricks, pb_package_pybricks);
 #endif
 
 /**
- * Import all pybricks.* modules.
+ * import * from all builtin Pybricks and MicroPython modules.
  */
 static void pb_package_import_all(void) {
 
-    // Go through each module in the package.
-    for (size_t i = 0; i < MP_ARRAY_SIZE(pybricks_globals_table); i++) {
-        mp_rom_obj_t module = pybricks_globals_table[i].value;
-        if (mp_obj_is_type(module, &mp_type_module)) {
-            // Import everything from the module.
-            mp_import_all((mp_obj_t)module);
-        }
+    // Go through all modules in mp_builtin_module_map.
+    for (size_t i = 0; i < mp_builtin_module_map.used; i++) {
+        // This is a constant map of modules, so we can skip checks for
+        // filled slots and module types.
+        mp_import_all(mp_builtin_module_map.table[i].value);
     }
+
     #if PYBRICKS_PY_HUBS
     // Initialize hub instance
     const mp_obj_t args;