Skip to content

Commit 2ff3d9d

Browse files
pfalconpfalcon
committed
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".
1 parent 69f1867 commit 2ff3d9d

5 files changed

Lines changed: 6 additions & 1 deletion

File tree

‎py/builtinimport.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@ mp_obj_t mp_builtin___import__(uint n_args, mp_obj_t *args) {
218218

219219
if (stat == MP_IMPORT_STAT_DIR) {
220220
DEBUG_printf("%s is dir\n", vstr_str(&path));
221+
mp_store_attr(module_obj, MP_QSTR___path__, mp_obj_new_str((byte*)vstr_str(&path), vstr_len(&path), false));
221222
vstr_add_char(&path, PATH_SEP_CHAR);
222223
vstr_add_str(&path, "__init__.py");
223224
if (mp_import_stat(vstr_str(&path)) != MP_IMPORT_STAT_FILE) {
@@ -230,7 +231,6 @@ mp_obj_t mp_builtin___import__(uint n_args, mp_obj_t *args) {
230231
vstr_cut_tail_bytes(&path, sizeof("/__init__.py") - 1); // cut off /__init__.py
231232
// https://docs.python.org/3.3/reference/import.html
232233
// "Specifically, any module that contains a __path__ attribute is considered a package."
233-
mp_store_attr(module_obj, MP_QSTR___path__, mp_obj_new_str((byte*)vstr_str(&path), vstr_len(&path), false));
234234
} else { // MP_IMPORT_STAT_FILE
235235
do_load(module_obj, &path);
236236
// TODO: We cannot just break here, at the very least, we must execute

‎tests/basics/import-pkg4.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Testing that "recursive" imports (pkg2/__init__.py imports from pkg2) work
2+
import pkg2

‎tests/basics/pkg2/__init__.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
from pkg2 import mod1

‎tests/basics/pkg2/mod1.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
from pkg2 import mod2

‎tests/basics/pkg2/mod2.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
print("in mod2")

0 commit comments

Comments
 (0)