Skip to content

Minor updates to protocol semantics #3996

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
gvanrossum merged 6 commits into from
Sep 29, 2017
Merged

Minor updates to protocol semantics #3996

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ec7e239
None should be subtype of empty protocol
ilevkivskyi Sep 24, 2017
2876a95
Apply None rule only to Callables, add unrelated previously forgotten…
ilevkivskyi Sep 24, 2017
fcdb276
Prohibit issubclass() for non-method protocols
ilevkivskyi Sep 24, 2017
22f942c
Merge remote-tracking branch 'upstream/master' into update-protocols
ilevkivskyi Sep 28, 2017
c31c99f
Address CR
ilevkivskyi Sep 28, 2017
07de2a3
Restore correct typeshed commit
ilevkivskyi Sep 28, 2017
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
Apply None rule only to Callables, add unrelated previously forgotten… 
… test
  • Loading branch information
@ilevkivskyi
ilevkivskyi committed Sep 24, 2017
commit 2876a95ed3a39b8690a5b4a19882cc028e4106b1
2 changes: 1 addition & 1 deletion mypy/subtypes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ def f(self) -> A: ...
is_compat = is_proper_subtype(subtype, supertype)
if not is_compat:
return False
if isinstance(subtype, NoneTyp) and member.startswith('__') and member.endswith('__'):
if isinstance(subtype, NoneTyp) and isinstance(supertype, CallableType):
# We want __hash__ = None idiom to work even without --strict-optional
return False
subflags = get_member_flags(member, left.type)
Expand Down
6 changes: 6 additions & 0 deletions test-data/unit/check-protocols.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2118,6 +2118,12 @@ main:10: note: def other(self, *args: Any, hint: Optional[str] = ..., **
main:10: note: Got:
main:10: note: def other(self) -> int

[case testObjectAllowedInProtocolBases]
from typing import Protocol
class P(Protocol, object):
pass
[out]

[case testNoneSubtypeOfEmptyProtocol]
from typing import Protocol
class P(Protocol):
Expand Down