Update Script/Main.py so it uses importlib #3399
Closed
Conversation
This file contains 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
bdbaddog
reviewed
Jun 26, 2019
src/engine/SCons/Script/Main.py
Outdated
| [site_dir]) | ||
| if PY3: | ||
| spec = importlib.util.find_spec(site_init_modname) | ||
| fp = open(spec.origin, 'r') |
There was a problem hiding this comment.
Will would this find modules in the site_dir?
There was a problem hiding this comment.
existing code adds it to sys.path above. it seems to work for the tests at least. importlib method doesn't have way to pass same arg.
mwichmann
force-pushed
the
main-importlib
branch
2 times, most recently
from
b05ec41
to
993b7c7
Compare
mwichmann
commented
Aug 16, 2019
src/engine/SCons/Script/Main.py
Outdated
| # we don't want a "hit" from a mod elsewhere in sys.path | ||
| save_syspath = sys.path | ||
| sys.path = [sys.path[0]] | ||
| spec = importlib.util.find_spec(site_init_modname) |
There was a problem hiding this comment.
I can do this even more simply by using importlib.spec_from_file_location (don't have to fiddle the path while doing it) if that's preferred. Tests come out the same.
mwichmann
added a commit
to mwichmann/scons
that referenced
this pull request
Aug 17, 2019
Tweaks: find spec for the site file by path rather than by fiddling sys.path to restrict the search. Rearrange a bit more and improve the comment a bit more. Signed-off-by: Mats Wichmann <mats@linux.com>
|
Is there still a concern about this one? |
mwichmann
added a commit
to mwichmann/scons
that referenced
this pull request
Oct 16, 2019
Tweaks: find spec for the site file by path rather than by fiddling sys.path to restrict the search. Rearrange a bit more and improve the comment a bit more. Signed-off-by: Mats Wichmann <mats@linux.com>
mwichmann
force-pushed
the
main-importlib
branch
from
d6ac70e
to
8cf9085
Compare
mwichmann
added a commit
to mwichmann/scons
that referenced
this pull request
Dec 16, 2019
Tweaks: find spec for the site file by path rather than by fiddling sys.path to restrict the search. Rearrange a bit more and improve the comment a bit more. Signed-off-by: Mats Wichmann <mats@linux.com>
mwichmann
force-pushed
the
main-importlib
branch
from
8cf9085
to
295ab2c
Compare
instead of deprecated imp module. Signed-off-by: Mats Wichmann <mats@linux.com>
Py3: address the problem that we might get a "site_init.py" from somewhere else in sys.path. Clean up excess indentation / try nesting; adjust comment. Signed-off-by: Mats Wichmann <mats@linux.com>
Tweaks: find spec for the site file by path rather than by fiddling sys.path to restrict the search. Rearrange a bit more and improve the comment a bit more. Signed-off-by: Mats Wichmann <mats@linux.com>
mwichmann
force-pushed
the
main-importlib
branch
from
295ab2c
to
be90eda
Compare
Signed-off-by: Mats Wichmann <mats@linux.com>
|
Can you purge the non PY3 code here and update the PR? |
|
rebase is proving a little challenging, will come back to it in a bit. |
3 tasks
|
This is withdrawn in favor of #3552 |
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.
instead of deprecated imp module. This approach is different than the one proposed in PR #3159. I find this more straightforward, but open to suggestions.
This is in support of issue #3299, since DeprecationWarnings are thrown.
Signed-off-by: Mats Wichmann mats@linux.com
Contributor Checklist:
master/src/CHANGES.txtdirectory (and read theREADME.txtin that directory)