Skip to content
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions Lib/test/test_typing.py
Original file line number Diff line number Diff line change
Expand Up @@ -4554,6 +4554,33 @@ class Commentable(Protocol):
)
self.assertIs(type(exc.__cause__), CustomError)

def test_isinstance_with_deferred_evaluation_of_annotations(self):
@runtime_checkable
class P(Protocol):
def meth(self):
...

class DeferredClass:
x: undefined

class DeferredClassImplementingP:
x: undefined | int

def __init__(self):
self.x = 0

def meth(self):
...

# override meth with a non-method attribute to make it part of __annotations__ instead of __dict__
class SubProtocol(P, Protocol):
meth: undefined


self.assertTrue(issubclass(SubProtocol, P))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These can use helpers assertIsSubclass, assertIsInstance, assertNotIsinstance.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated it to use the helper methods

self.assertFalse(isinstance(DeferredClass(), P))
self.assertTrue(isinstance(DeferredClassImplementingP(), P))

def test_deferred_evaluation_of_annotations(self):
class DeferredProto(Protocol):
x: DoesNotExist
Expand Down
10 changes: 6 additions & 4 deletions Lib/typing.py
Original file line number Diff line number Diff line change
Expand Up @@ -2020,10 +2020,12 @@ def _proto_hook(cls, other):
break

# ...or in annotations, if it is a sub-protocol.
annotations = getattr(base, '__annotations__', {})
if (isinstance(annotations, collections.abc.Mapping) and
attr in annotations and
issubclass(other, Generic) and getattr(other, '_is_protocol', False)):
annotations = _lazy_annotationlib.get_annotations(base, format=_lazy_annotationlib.Format.FORWARDREF)
if (
issubclass(other, Generic)
and getattr(other, "_is_protocol", False)
and attr in annotations
):
break
else:
return NotImplemented
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
:class:`typing.Protocol` now uses :func:`annotationlib.get_annotations` when
checking whether or not an instance implements the protocol with
:func:`isinstance`. This enables support for ``isinstance`` checks against
classes with deferred annotations.
Loading