Handle None entries in sys.modules. #19601
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
tacaswell
approved these changes
Mar 1, 2021
sys.modules entries can be explicitly set to None to block imports, so
the `name in sys.modules` check should rather be written
`sys.modules.get(name)` (... is not None).
While we're at it, disentangle a bit install_repl_displayhook to exit
early if `not sys.modules.get("IPython") or not get_ipython()`, which
avoids having to throw a local NotIPython exception just to `goto end`.
(Also note that the import of `backend2gui` should not throw an
ImportError, as that mapping has been around since <2011).
|
Anybody can merge after CI pass. |
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.
sys.modules entries can be explicitly set to None to block imports, so
the
name in sys.modulescheck should rather be writtensys.modules.get(name)(... is not None).While we're at it, disentangle a bit install_repl_displayhook to exit
early if
not sys.modules.get("IPython") or not get_ipython(), whichavoids having to throw a local NotIPython exception just to
goto end.(Also note that the import of
backend2guishould not throw anImportError, as that mapping has been around since <2011).
xref #19597 (I intentionally left out the case handled by #19597 to avoid a conflict)
PR Summary
PR Checklist
pytestpasses).flake8on changed files to check).flake8-docstringsand runflake8 --docstring-convention=all).doc/users/next_whats_new/(follow instructions in README.rst there).doc/api/next_api_changes/(follow instructions in README.rst there).