py/builtinimport: support relative import in custom __import__ callbacks #6665
+62
−7
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The globals need to be forwarded from the callers context.
|
+1 |
globals() needs to be provided in case __import__ is a Python function
According to documentation time() has a precision of at least 1 second. This test runs for 2.5 seconds and calls all utime functions every 100ms. Then it checks if they returned enough different results. All functions with sub-second precision will return ~25 results. This test passes with 15 results or more. Functions that do not exist are skipped silently.
With MICROPY_FLOAT_IMPL_FLOAT the results of utime.time(), gmtime() and localtime() change only every 129 seconds. As one consequence tests/extmod/vfs_lfs_mtime.py will fail on a unix port with LFS support. With this patch these functions only return floats if MICROPY_FLOAT_IMPL_DOUBLE is used. Otherwise they return integers.
added support for the separators keyword argument in ujson's dump and dumps. added keyword argument indent, only accepts indent=None. indent was only added because it is connected to separators.
…s' into dev" This reverts commit 4a36076.
…ive-import' into dev" This reverts commit 8413c46.
The globals need to be forwarded from the callers context.
globals() needs to be provided in case __import__ is a Python function
Support relative import in custom __import__ callback
tannewt
added a commit
to tannewt/circuitpython
that referenced
this pull request
Jul 30, 2022
…-name fix name for macOS mpy-cross universal build
|
This is an automated heads-up that we've just merged a Pull Request See #13763 A search suggests this PR might apply the STATIC macro to some C code. If it Although this is an automated message, feel free to @-reply to me directly if |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The globals need to be forwarded from the callers context.
This pull request adds a test with relative import and override as well as a fix.
I've tried to use a custom python function for import to make some performance measurements (actually tracking approximate memory usage). There i noticed that's impossible for a python handler function to support relative imports (
level> 0). This is due to the globals thatmp_builtin___import__is getting are from the custom callback instead of the module whereimport/__import__was called. So the lookup of__path__gives the wrong value.The solution is that
mp_import_nameinruntime.cgets the globals and passes them along in de parameter that already exists for this purpose (i see CPython is doing this too).mp_builtin___import__uses theglobalsparameter or falls back to the old behavior ifNoneis passed or fewer positional args are provided.