Thanks to visit codestin.com
Credit goes to github.com

Skip to content

gh-113320: Reduce the number of dangerous getattr() calls when constructing protocol classes #113401

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 4 commits into from
Jan 5, 2024
Merged

gh-113320: Reduce the number of dangerous getattr() calls when constructing protocol classes #113401

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7b9f8a1
gh-113320: Reduce the number of dangerous `getattr()` calls when cons…
AlexWaygood Dec 22, 2023
2d8d40a
Better comment
AlexWaygood Dec 23, 2023
484f0d0
Merge branch 'main' into classproperties-protocols-2
AlexWaygood Jan 5, 2024
e0e108b
Address review + add a couple of comments
AlexWaygood Jan 5, 2024
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
Address review + add a couple of comments
  • Loading branch information
@AlexWaygood
AlexWaygood committed Jan 5, 2024
commit e0e108b43f50e9428888a08f3fdb922110860288
6 changes: 0 additions & 6 deletions Lib/test/test_typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3472,12 +3472,6 @@ def meth(self): pass
vars(NonPR).keys(), vars(D).keys() | acceptable_extra_attrs
)

def test_nonruntime_protocols_not_unnecessarily_introspected(self) -> None:
class Foo(Protocol):
x = 1

self.assertFalse(hasattr(Foo, "__non_callable_proto_members__"))

def test_custom_subclasshook(self):
class P(Protocol):
x = 1
Expand Down
2 changes: 2 additions & 0 deletions Lib/typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1848,6 +1848,7 @@ def __subclasscheck__(cls, other):
"@runtime_checkable protocols"
)
if (
# this attribute is set by @runtime_checkable:
cls.__non_callable_proto_members__
and cls.__dict__.get("__subclasshook__") is _proto_hook
):
Expand Down Expand Up @@ -1884,6 +1885,7 @@ def __instancecheck__(cls, instance):
val = getattr_static(instance, attr)
except AttributeError:
break
# this attribute is set by @runtime_checkable:
if val is None and attr not in cls.__non_callable_proto_members__:
break
else:
Expand Down