Skip to content

Make parent patching occur only on imports - #2061

Merged
gvanrossum merged 4 commits into
python:masterfrom
Michael0x2a:remove-patch-parent
Aug 29, 2016
Merged

gvanrossum merged 4 commits into
python:masterfrom
Michael0x2a:remove-patch-parent

Conversation

@Michael0x2a

Copy link
Copy Markdown
Collaborator

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_parent process.

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).

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.
@gvanrossum
gvanrossum merged commit 3327563 into python:master Aug 29, 2016
@Michael0x2a
Michael0x2a deleted the remove-patch-parent branch September 1, 2016 21:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants