py: Only load frozen modules when the filename has the prefix. #235
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
This allows one to override a built-in module by loading a newer version onto the file system.
dhalbert
reviewed
Sep 6, 2017
| // requested filename in the list of frozen module filenames. | ||
| #if MICROPY_MODULE_FROZEN | ||
| void *modref; | ||
| int frozen_type = mp_find_frozen_module(file_str + MP_FROZEN_FAKE_DIR_SLASH_LENGTH, file->len - MP_FROZEN_FAKE_DIR_SLASH_LENGTH, &modref); |
There was a problem hiding this comment.
I think the checking for ".frozen/" here now means the checking for ".frozen/" in mp_find_frozen_module() is no longer needed. But we can just leave it in. Basically you hoisted that check up to where it was really needed.
This and pyexec_frozen_module() are the only calls to mp_find_frozen_module().
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.
This allows one to override a built-in module by loading a newer
version onto the file system.