builtinimport: Set __path__ attribute ASAP as it's clear we have a package.
This helps with handling "recursive" imports in sane manner, for example
when foo/__init__.py has something like "from foo import submod".
diff --git a/py/builtinimport.c b/py/builtinimport.c
index 501ced7..9eede65 100644
--- a/py/builtinimport.c
+++ b/py/builtinimport.c
@@ -218,6 +218,7 @@
if (stat == MP_IMPORT_STAT_DIR) {
DEBUG_printf("%s is dir\n", vstr_str(&path));
+ mp_store_attr(module_obj, MP_QSTR___path__, mp_obj_new_str((byte*)vstr_str(&path), vstr_len(&path), false));
vstr_add_char(&path, PATH_SEP_CHAR);
vstr_add_str(&path, "__init__.py");
if (mp_import_stat(vstr_str(&path)) != MP_IMPORT_STAT_FILE) {
@@ -230,7 +231,6 @@
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."
- mp_store_attr(module_obj, MP_QSTR___path__, mp_obj_new_str((byte*)vstr_str(&path), vstr_len(&path), false));
} else { // MP_IMPORT_STAT_FILE
do_load(module_obj, &path);
// TODO: We cannot just break here, at the very least, we must execute
diff --git a/tests/basics/import-pkg4.py b/tests/basics/import-pkg4.py
new file mode 100644
index 0000000..90b6f2e
--- /dev/null
+++ b/tests/basics/import-pkg4.py
@@ -0,0 +1,2 @@
+# Testing that "recursive" imports (pkg2/__init__.py imports from pkg2) work
+import pkg2
diff --git a/tests/basics/pkg2/__init__.py b/tests/basics/pkg2/__init__.py
new file mode 100644
index 0000000..101ac7d
--- /dev/null
+++ b/tests/basics/pkg2/__init__.py
@@ -0,0 +1 @@
+from pkg2 import mod1
diff --git a/tests/basics/pkg2/mod1.py b/tests/basics/pkg2/mod1.py
new file mode 100644
index 0000000..03754a4
--- /dev/null
+++ b/tests/basics/pkg2/mod1.py
@@ -0,0 +1 @@
+from pkg2 import mod2
diff --git a/tests/basics/pkg2/mod2.py b/tests/basics/pkg2/mod2.py
new file mode 100644
index 0000000..97dadcd
--- /dev/null
+++ b/tests/basics/pkg2/mod2.py
@@ -0,0 +1 @@
+print("in mod2")