Make logic around bind_self() consistent in different code paths - #8021
Merged
Conversation
JukkaL
approved these changes
Nov 27, 2019
JukkaL
left a comment
JukkaL
left a comment
Collaborator
There was a problem hiding this comment.
Thanks for the quick fix!
ilevkivskyi
added a commit
that referenced
this pull request
Nov 29, 2019
This is a follow up for #8021, that applies the fix also to non-callable types. Currently non-callable types are still wrong: ```python R = TypeVar('R') T = TypeVar('T') # Can be any decorator that makes type non-callable. def classproperty(f: Callable[..., R]) -> R: ... class C(Generic[T]): @classproperty def test(self) -> T: ... x: C[int] y: Type[C[int]] reveal_type(x.test) # Revealed type is 'int', OK reveal_type(y.test) # Revealed type is 'T' ??? ``` So, #7724 strikes again. It turns out there is not only duplicated logic for attribute kinds (decorators vs normal methods), but also for callable vs non-callable types. In latter case we still need to expand the type (like in other places, e.g., `analyze_var`).
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.
Fixes #8020
There is a bunch of code/logic duplication around
bind_self(), mostly because of #7724. This PR makes all three main code paths consistently follow the same structure:freshen_function_type_vars()bind_self()expand_type_by_instance(..., map_instance_to_supertype())(a.k.amap_type_from_supertype())I briefly scrolled through other code paths, and it looks like this was last major/obvious inconsistency (although code around
__getattr__/__setattr__/__get__/__set__looks a bit suspicious).