Make parent patching occur only on imports #2061
Merged
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
This commit removes the "patch_parent" phase. The logic within those phases are now run only when a file is actually importing something, instead of being done automatically. This fixes some irregularities with how imports are handled. In particular, the "patch parent" stage was interacting poorly with implicit module references since the automatic patch would add back in an explicit module reference even when it was removed, which could preserve an implicit reference that should have instead been broken. That is, the presense of "patch parent" was sometimes concealing errors that should have been caught.
This commit tweaks some subtly broken imports that were not caught before due to the automatic patching patch_parent performed.
Previously, my modifications to the parent patching process only took place when loading imports of the form `import a.b.c`. This commit adds more extensive tests to confirm the parent patching happens in all kinds of imports (i.e. `from a.b import c`).
My previous modification to parent patching took place only when doing imports of the form `import a.b.c`. This commit changes this so parent patching happens when doing any kind of import.
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.
Previously, when mypy encountered a submodule during the stale SCC handling phase, it would automatically add a reference in the submodule's parent to the submodule -- it would always run the
patch_parentprocess.This pull request removes this automatic parent patching process and instead makes it happen only when a file actually choses to import a module (which more closely mimics how Python loads modules).
Currently, this makes no real difference, but it does fix some bugs with some experimental improvements to incremental mode (namely, #2041).