Make None compatible with SupportsStr protocol
#13184
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
This comment has been minimized.
This comment has been minimized.
mypy/subtypes.py
Outdated
| @@ -239,7 +239,9 @@ def visit_none_type(self, left: NoneType) -> bool: | |||
| members = self.right.type.protocol_members | |||
| # None is compatible with Hashable (and other similar protocols). This is | |||
| # slightly sloppy since we don't check the signature of "__hash__". | |||
| return not members or members == ["__hash__"] | |||
| # None is also compatible with `SupportsStr` protocol. | |||
| supported_members = frozenset(("__hash__", "__str__")) | |||
There was a problem hiding this comment.
Not sure how important it is to micro-optimize this, but maybe move the frozenset into a global constant?
There was a problem hiding this comment.
I was unable to find a good global name for this 😆
This is why I went for a local variable. If mypyc can somehow optimize this to a noticable difference, I have no problem in moving it to a global namespace.
There was a problem hiding this comment.
For mypyc the fastest thing could be to inline the members check -- i.e. all(member in ("__hash__", "__str__") for member in members) -- since that gets optimized to two string equality checks (but it's not a big deal).
sobolevn
commented
Jul 20, 2022
sobolevn
commented
Jul 20, 2022
This comment has been minimized.
This comment has been minimized.
|
According to mypy_primer, this change has no effect on the checked open source code. 🤖🎉 |
JukkaL
approved these changes
Jul 20, 2022
|
Thanks! |
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 we had a special case for
Noneand__hash__, but it can be extened for__str__as well.In the future we can change all our
Nonehacks to useNoneType, but not today :)Closes #13081