Commit 20993688 authored by Damien George's avatar Damien George

py/builtinimport: Add compile-time option to disable external imports.

The new option is MICROPY_ENABLE_EXTERNAL_IMPORT and is enabled by default
so that the default behaviour is the same as before.  With it disabled
import is only supported for built-in modules, not for external files nor
frozen modules.  This allows to support targets that have no filesystem of
any kind and that only have access to pre-supplied built-in modules
implemented natively.
parent 6e7819ee
......@@ -44,6 +44,8 @@
#define DEBUG_printf(...) (void)0
#define PATH_SEP_CHAR '/'
bool mp_obj_is_package(mp_obj_t module) {
......@@ -473,4 +475,41 @@ mp_obj_t mp_builtin___import__(size_t n_args, const mp_obj_t *args) {
// Otherwise, we need to return top-level package
return top_module_obj;
mp_obj_t mp_builtin___import__(size_t n_args, const mp_obj_t *args) {
// Check that it's not a relative import
if (n_args >= 5 && MP_OBJ_SMALL_INT_VALUE(args[4]) != 0) {
mp_raise_NotImplementedError("relative import");
// Check if module already exists, and return it if it does
qstr module_name_qstr = mp_obj_str_get_qstr(args[0]);
mp_obj_t module_obj = mp_module_get(module_name_qstr);
if (module_obj != MP_OBJ_NULL) {
return module_obj;
// Check if there is a weak link to this module
mp_map_elem_t *el = mp_map_lookup((mp_map_t*)&mp_builtin_module_weak_links_map, MP_OBJ_NEW_QSTR(module_name_qstr), MP_MAP_LOOKUP);
if (el != NULL) {
// Found weak-linked module
mp_module_call_init(module_name_qstr, el->value);
return el->value;
// Couldn't find the module, so fail
mp_raise_msg(&mp_type_ImportError, "module not found");
} else {
"no module named '%q'", module_name_qstr));
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin___import___obj, 1, 5, mp_builtin___import__);
......@@ -405,6 +405,13 @@
/* Python internal features */
// Whether to enable import of external modules
// When disabled, only importing of built-in modules is supported
// When enabled, a port must implement mp_import_stat (among other things)
// Whether to use the POSIX reader for importing files
......@@ -1337,6 +1337,8 @@ import_error:
return dest[0];
// See if it's a package, then can try FS import
if (!mp_obj_is_package(module)) {
goto import_error;
......@@ -1363,6 +1365,13 @@ import_error:
// TODO lookup __import__ and call that instead of going straight to builtin implementation
return mp_builtin___import__(5, args);
// Package import not supported with external imports disabled
goto import_error;
void mp_import_all(mp_obj_t module) {
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment