djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builtinimport: Revamp&refactor handling of relative imports.

Browse Source 
Relative imports are based of a package, so we're currently at a module
within a package, we should get to package first.

Also, factor out path travsering operation, but this broke testing for
boundary errors with relative imports. TODO: reintroduce them, together
with proper tests.
This commit is contained in:
Paul Sokolovsky 2015-02-16 12:10:13 +02:00
parent 078172dcab
commit 9e6c82960e
1 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
py/builtinimport.c
View File

@ -139,6 +139,17 @@ STATIC void do_load(mp_obj_t module_obj, vstr_t *file) {
do_load_from_lexer(module_obj, lex, file_str); do_load_from_lexer(module_obj, lex, file_str);
} }
STATIC void chop_component(const char *start, const char **end) {
const char *p = *end;
while (p > start) {
if (*--p == '.') {
*end = p;
return;
}
}
*end = p;
}
mp_obj_t mp_builtin___import__(mp_uint_t n_args, const mp_obj_t *args) { mp_obj_t mp_builtin___import__(mp_uint_t n_args, const mp_obj_t *args) {
#if DEBUG_PRINT #if DEBUG_PRINT
DEBUG_printf("__import__:\n"); DEBUG_printf("__import__:\n");
@ -170,30 +181,38 @@ mp_obj_t mp_builtin___import__(mp_uint_t n_args, const mp_obj_t *args) {
// http://legacy.python.org/dev/peps/pep-0328/#relative-imports-and-name // http://legacy.python.org/dev/peps/pep-0328/#relative-imports-and-name
// "Relative imports use a module's __name__ attribute to determine that // "Relative imports use a module's __name__ attribute to determine that
// module's position in the package hierarchy." // module's position in the package hierarchy."
level--;
mp_obj_t this_name_q = mp_obj_dict_get(mp_globals_get(), MP_OBJ_NEW_QSTR(MP_QSTR___name__)); mp_obj_t this_name_q = mp_obj_dict_get(mp_globals_get(), MP_OBJ_NEW_QSTR(MP_QSTR___name__));
assert(this_name_q != MP_OBJ_NULL); assert(this_name_q != MP_OBJ_NULL);
mp_map_t *globals_map = mp_obj_dict_get_map(mp_globals_get());
mp_map_elem_t *elem = mp_map_lookup(globals_map, MP_OBJ_NEW_QSTR(MP_QSTR___path__), MP_MAP_LOOKUP);
bool is_pkg = (elem != NULL);
#if DEBUG_PRINT #if DEBUG_PRINT
DEBUG_printf("Current module: "); DEBUG_printf("Current module/package: ");
mp_obj_print(this_name_q, PRINT_REPR); mp_obj_print(this_name_q, PRINT_REPR);
DEBUG_printf(", is_package: %d", is_pkg);
DEBUG_printf("\n"); DEBUG_printf("\n");
#endif #endif
mp_uint_t this_name_l; mp_uint_t this_name_l;
const char *this_name = mp_obj_str_get_data(this_name_q, &this_name_l); const char *this_name = mp_obj_str_get_data(this_name_q, &this_name_l);
uint dots_seen = 0; const char *p = this_name + this_name_l;
const char *p = this_name + this_name_l - 1; if (!is_pkg) {
while (p > this_name) { // We have module, but relative imports are anchored at package, so
if (*p == '.') { // go there.
dots_seen++; chop_component(this_name, &p);
if (--level == 0) {
break;
}
}
p--;
} }
if (dots_seen == 0 && level == 1) {
uint dots_seen = 0;
while (level--) {
chop_component(this_name, &p);
dots_seen++;
}
if (dots_seen == 0 && level >= 1) {
// http://legacy.python.org/dev/peps/pep-0328/#relative-imports-and-name // http://legacy.python.org/dev/peps/pep-0328/#relative-imports-and-name
// "If the module's name does not contain any package information // "If the module's name does not contain any package information
// (e.g. it is set to '__main__') then relative imports are // (e.g. it is set to '__main__') then relative imports are
@ -206,7 +225,7 @@ mp_obj_t mp_builtin___import__(mp_uint_t n_args, const mp_obj_t *args) {
// talk about packages, it talks about dot-less module names. // talk about packages, it talks about dot-less module names.
DEBUG_printf("Warning: no dots in current module name and level>0\n"); DEBUG_printf("Warning: no dots in current module name and level>0\n");
p = this_name + this_name_l; p = this_name + this_name_l;
} else if (level != 0) { } else if (level != -1) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_ImportError, "Invalid relative import")); nlr_raise(mp_obj_new_exception_msg(&mp_type_ImportError, "Invalid relative import"));
} }