Start moving away from named_type callback architecture#21201
Merged
ilevkivskyi merged 3 commits intopython:masterfrom Apr 13, 2026
Merged
Start moving away from named_type callback architecture#21201ilevkivskyi merged 3 commits intopython:masterfrom
ilevkivskyi merged 3 commits intopython:masterfrom
Conversation
This comment has been minimized.
This comment has been minimized.
JukkaL
approved these changes
Apr 13, 2026
Collaborator
JukkaL
left a comment
JukkaL
left a comment
There was a problem hiding this comment.
I agree that now that modules are available via global state, the callbacks are pointless and just make the code harder to understand (and error-prone, as you mentioned).
mypy/modules_state.py
Outdated
|
|
||
|
|
||
| fixer_state: Final = FixerState() | ||
| modules_state: Final = FixerState() |
Collaborator
There was a problem hiding this comment.
Style nit: Rename also FixerState -> ModulesState or similar.
| # We keep the unused `named_type` argument to avoid breaking plugins. | ||
| def type_object_type( | ||
| info: TypeInfo, named_type: Callable[[str], Instance] | None = None | ||
| ) -> ProperType: |
Collaborator
There was a problem hiding this comment.
Maybe document the unused named_type parameter in the docstring, as it may look confusing.
Contributor
|
According to mypy_primer, this change doesn't affect type check results on a corpus of open source code. ✅ |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This is a follow-up for #21170
Now that we have
modulesavailable as part of the global state (for the purposes of lazy deserialization), I propose to gradually move away from (IMO awkward) architecture where we pass around a lot ofnamed_typecallbacks, and instead use:lookup.py)I am not sure yet what is the best way to use instance cache in a most robust way. For now I am starting with something a bit ad-hoc. We can experiment with this, and see if this works.
Note I only migrate few most problematic cases of the old callback-based pattern (one of those actually used an invalid callback). I also rename the global state file added in #21170 to have more generic name.
This also removes one function-level import and few nested functions, which may make code faster with mypyc (I measure 0.5% improvement, but this is at the noise level).
cc @JukkaL