Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
flow3r firmware
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
dos
flow3r firmware
Commits
c146bb37
Verified
Commit
c146bb37
authored
Oct 9, 2023
by
dos
Browse files
Options
Downloads
Patches
Plain Diff
printf
parent
ff8c0de2
No related branches found
No related tags found
No related merge requests found
Pipeline
#9031
passed
Oct 9, 2023
Stage: build
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
components/micropython/vendor/py/builtinimport.c
+6
-8
6 additions, 8 deletions
components/micropython/vendor/py/builtinimport.c
with
6 additions
and
8 deletions
components/micropython/vendor/py/builtinimport.c
+
6
−
8
View file @
c146bb37
...
...
@@ -292,12 +292,10 @@ STATIC void evaluate_relative_import(mp_int_t level, const char **module_name, s
// If we have a __path__ in the globals dict, then we're a package.
bool
is_pkg
=
mp_map_lookup
(
&
mp_globals_get
()
->
map
,
MP_OBJ_NEW_QSTR
(
MP_QSTR___path__
),
MP_MAP_LOOKUP
);
#if DEBUG_PRINT
DEBUG_printf
(
"Current module/package: "
);
mp_obj_print_helper
(
MICROPY_DEBUG_PRINTER
,
current_module_name_obj
,
PRINT_REPR
);
DEBUG_printf
(
", is_package: %d"
,
is_pkg
);
DEBUG_printf
(
"
\n
"
);
#endif
printf
(
"Current module/package: "
);
mp_obj_print_helper
(
&
mp_plat_print
,
current_module_name_obj
,
PRINT_REPR
);
printf
(
", is_package: %d"
,
is_pkg
);
printf
(
"
\n
"
);
size_t
current_module_name_len
;
const
char
*
current_module_name
=
mp_obj_str_get_data
(
current_module_name_obj
,
&
current_module_name_len
);
...
...
@@ -341,7 +339,7 @@ STATIC void evaluate_relative_import(mp_int_t level, const char **module_name, s
qstr
new_mod_q
=
qstr_from_strn
(
new_mod
,
new_module_name_len
);
mp_local_free
(
new_mod
);
DEBUG_
printf
(
"Resolved base name for relative import: '%s'
\n
"
,
qstr_str
(
new_mod_q
));
printf
(
"Resolved base name for relative import: '%s'
\n
"
,
qstr_str
(
new_mod_q
));
*
module_name
=
qstr_str
(
new_mod_q
);
*
module_name_len
=
new_module_name_len
;
}
...
...
@@ -524,7 +522,7 @@ mp_obj_t mp_builtin___import___default(size_t n_args, const mp_obj_t *args) {
mp_raise_ValueError
(
MP_ERROR_TEXT
(
"bar"
));
}
DEBUG_
printf
(
"Starting module search for '%s'
\n
"
,
module_name
);
printf
(
"Starting module search for '%s'
\n
"
,
module_name
);
VSTR_FIXED
(
path
,
MICROPY_ALLOC_PATH_MAX
)
mp_obj_t
top_module_obj
=
MP_OBJ_NULL
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment