Move .frozen to second entry in sys.path #8105
Merged
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
dpgeorge
commented
Dec 21, 2021
| @@ -90,7 +90,7 @@ | |||
| #define MICROPY_PY_SYS_ATEXIT (1) | |||
| #define MICROPY_PY_SYS_PLATFORM "win32" | |||
| #ifndef MICROPY_PY_SYS_PATH_DEFAULT | |||
| #define MICROPY_PY_SYS_PATH_DEFAULT "~/.micropython/lib" | |||
| #define MICROPY_PY_SYS_PATH_DEFAULT ".frozen;~/.micropython/lib" | |||
There was a problem hiding this comment.
@stinos is ; the correct separator here for all cases where the windows port will run? Even if it runs under mingw does it still use ;?
There was a problem hiding this comment.
Yes, unix/main.c has PATHLIST_SEP_CHAR as ; for all windows ports, and it's the only place where MICROPY_PY_SYS_PATH_DEFAULT is used
There was a problem hiding this comment.
Great, thanks for confirming.
fed2fb2 to
89875e2
Compare
In commit 86ce442 the '.frozen' entry was added at the start of sys.path, to allow control over when frozen modules are searched during import, and retain existing behaviour whereby frozen was searched before the filesystem. But Python semantics of sys.path require sys.path[0] to be the directory of the currently executing script, or ''. This commit moves the '.frozen' entry to second place in sys.path, so sys.path[0] retains its correct value (described above). Signed-off-by: Damien George <damien@micropython.org>
Signed-off-by: Damien George <damien@micropython.org>
89875e2 to
959e6f7
Compare
tannewt
pushed a commit
to tannewt/circuitpython
that referenced
this pull request
Jul 7, 2023
improve start_ap() doc; make "authmode" use consistent internally
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 recent change to allow a
".frozen"entry insys.pathto specify the frozen module search order (see #8079) placed this entry at the start ofsys.path. This is against the CPython standard/docs/behaviour which requiressys.path[0]to be the location of the current script (or''if that can't be determined, like at a REPL).Some scripts will use
sys.path[0]to find out where they are run from. And egupipis now broken with".frozen"as the first entry.The reason
".frozen"was put first was to keep the same behaviour as before for searching frozen modules, namely that frozen code is searched before the filesystem (frozen code was previously searched when""was encountered insys.path). But this behaviour will need to change because it's more important to havesys.path[0]being the current script's directory (or the empty string).This PR does the following:
".frozen"to the second entry insys.path".frozen"part ofMICROPY_PY_SYS_PATH_DEFAULTon the unix and windows ports, so it can be overridden/changed by use of theMICROPYPATHenvironment variableupipto skip".frozen"because it doesn't make sense to install to.frozenSee related #7536.