From a5854d2bc5717cb5b6f589f367acaa6d0c8b0179 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Tue, 15 Apr 2014 01:23:40 +0300 Subject: [PATCH] builtinimport: Add basic support for namespace packages. That was easy - just avoid erroring out on seeing candidate dir for namespace package. That's far from being complete though - namespace packages should support importing portions of package from different sys.path entries, here we require first matching entry to contain all namespace package's portions. And yet, that's a way to put parts of the same Python package into multiple installable package - something we really need for *Micro*Python. --- py/builtinimport.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/py/builtinimport.c b/py/builtinimport.c index 3f63768ad4..262ee04a53 100644 --- a/py/builtinimport.c +++ b/py/builtinimport.c @@ -292,11 +292,10 @@ mp_obj_t mp_builtin___import__(uint n_args, mp_obj_t *args) { vstr_add_str(&path, "__init__.py"); if (mp_import_stat(vstr_str(&path)) != MP_IMPORT_STAT_FILE) { vstr_cut_tail_bytes(&path, sizeof("/__init__.py") - 1); // cut off /__init__.py - nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ImportError, - "Per PEP-420 a dir without __init__.py (%s) is a namespace package; " - "namespace packages are not supported", vstr_str(&path))); + printf("Notice: %s is imported as namespace package\n", vstr_str(&path)); + } else { + do_load(module_obj, &path); } - do_load(module_obj, &path); vstr_cut_tail_bytes(&path, sizeof("/__init__.py") - 1); // cut off /__init__.py // https://docs.python.org/3.3/reference/import.html // "Specifically, any module that contains a __path__ attribute is considered a package."