Skip to content

gh-74690: typing: Call _get_protocol_attrs and _callable_members_only at protocol class creation time, not during isinstance() checks #103160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AlexWaygood merged 9 commits into from
Apr 5, 2023
Merged

gh-74690: typing: Call _get_protocol_attrs and _callable_members_only at protocol class creation time, not during isinstance() checks #103160

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f15c64a
gh-74690: typing: Cache results of `_get_protocol_attrs` and `_callab…
AlexWaygood Mar 31, 2023
f3ec3db
Simplify and inline
AlexWaygood Apr 1, 2023
8e3c6f7
Use a metaclass instance method, not a classmethod on the class
AlexWaygood Apr 1, 2023
a34f700
Move to class-creation time
AlexWaygood Apr 1, 2023
4d05074
Use `__init__`, not `__new__`
AlexWaygood Apr 1, 2023
d3f9ebe
Add missing `super().__init__()` call, to be safe
AlexWaygood Apr 1, 2023
e8a6304
Merge branch 'main' into protocol-attrs-cache-1
AlexWaygood Apr 2, 2023
4816afa
Merge branch 'main' into protocol-attrs-cache-1
AlexWaygood Apr 5, 2023
08af615
Update Lib/typing.py
AlexWaygood Apr 5, 2023
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
Prev Previous commit
Next Next commit
Merge branch 'main' into protocol-attrs-cache-1
  • Loading branch information
@AlexWaygood
AlexWaygood authored Apr 2, 2023
commit e8a63045eb5d108483e71ba8714797e8f7e835cd
14 changes: 9 additions & 5 deletions Lib/typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2036,11 +2036,15 @@ def __instancecheck__(cls, instance):
return True

if is_protocol_cls:
if all(hasattr(instance, attr) and
# All *methods* can be blocked by setting them to None.
(not callable(getattr(cls, attr, None)) or
getattr(instance, attr) is not None)
for attr in cls.__protocol_attrs__):
getattr_static = _lazy_load_getattr_static()
for attr in cls.__protocol_attrs__:
try:
val = getattr_static(instance, attr)
except AttributeError:
break
if callable(getattr(cls, attr, None)) and val is None:
break
else:
return True

return super().__instancecheck__(instance)
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.