Backport some recent Protocol fixes from 3.12#161
Merged
JelleZijlstra merged 3 commits intopython:mainfrom May 19, 2023
Merged
Conversation
AlexWaygood
commented
May 19, 2023
Comment on lines
+2401
to
+2438
| exec(textwrap.dedent( | ||
| """ | ||
| def test_pep695_generic_protocol_callable_members(self): | ||
| @runtime_checkable | ||
| class Foo[T](Protocol): | ||
| def meth(self, x: T) -> None: ... | ||
|
|
||
| class Bar[T]: | ||
| def meth(self, x: T) -> None: ... | ||
|
|
||
| self.assertIsInstance(Bar(), Foo) | ||
| self.assertIsSubclass(Bar, Foo) | ||
|
|
||
| @runtime_checkable | ||
| class SupportsTrunc[T](Protocol): | ||
| def __trunc__(self) -> T: ... | ||
|
|
||
| self.assertIsInstance(0.0, SupportsTrunc) | ||
| self.assertIsSubclass(float, SupportsTrunc) | ||
|
|
||
| def test_no_weird_caching_with_issubclass_after_isinstance_pep695(self): | ||
| @runtime_checkable | ||
| class Spam[T](Protocol): | ||
| x: T | ||
|
|
||
| class Eggs[T]: | ||
| def __init__(self, x: T) -> None: | ||
| self.x = x | ||
|
|
||
| self.assertIsInstance(Eggs(42), Spam) | ||
|
|
||
| # gh-104555: If we didn't override ABCMeta.__subclasscheck__ in _ProtocolMeta, | ||
| # TypeError wouldn't be raised here, | ||
| # as the cached result of the isinstance() check immediately above | ||
| # would mean the issubclass() call would short-circuit | ||
| # before we got to the "raise TypeError" line | ||
| with self.assertRaises(TypeError): | ||
| issubclass(Eggs, Spam) |
Member
Author
There was a problem hiding this comment.
I think these pass, but had no way of checking, since typing_extensions currently fails to import on 3.12:
Traceback (most recent call last):
File "C:\Users\alexw\coding\typing_extensions\src\test_typing_extensions.py", line 29, in <module>
import typing_extensions
File "C:\Users\alexw\coding\typing_extensions\src\typing_extensions.py", line 1361, in <module>
class TypeVar(typing.TypeVar, _DefaultMixin, _root=True):
TypeError: type 'typing.TypeVar' is not an acceptable base type
Member
Author
|
Oh, the PyPy version of |
Member
Author
Ugh, that means we'll probably have to mark the test in CPython as |
JelleZijlstra
approved these changes
May 19, 2023
This was referenced May 19, 2023
This was referenced May 23, 2023
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.
Backports these PRs:
isinstance()influence whetherissubclass()raises an exception cpython#104559typing._ProtocolMeta.__instancecheck__cpython#104649