Skip to content

Fixes protocols with untyped slots #9314

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
merged 6 commits into from
Aug 28, 2020
Merged

Fixes protocols with untyped slots #9314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
527f167
Fixes protocols with untyped slots
sobolevn Aug 16, 2020
5a053d2
Fixes protocols with untyped slots
sobolevn Aug 16, 2020
91ea98d
Fixes protocols with untyped slots
sobolevn Aug 16, 2020
66d7637
Update mypy/semanal.py
sobolevn Aug 17, 2020
d01a56f
Update semanal.py
sobolevn Aug 24, 2020
d398a20
Update semanal.py
sobolevn Aug 24, 2020
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
17 changes: 15 additions & 2 deletions mypy/semanal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2320,8 +2320,8 @@ def process_type_annotation(self, s: AssignmentStmt) -> None:
if isinstance(lvalue.node, Var):
lvalue.node.is_abstract_var = True
else:
if (any(isinstance(lv, NameExpr) and lv.is_inferred_def for lv in s.lvalues) and
self.type and self.type.is_protocol and not self.is_func_scope()):
if (self.type and self.type.is_protocol and
self.is_annotated_protocol_member(s) and not self.is_func_scope()):
self.fail('All protocol members must have explicitly declared types', s)
# Set the type if the rvalue is a simple literal (even if the above error occurred).
if len(s.lvalues) == 1 and isinstance(s.lvalues[0], RefExpr):
Expand All @@ -2332,6 +2332,19 @@ def process_type_annotation(self, s: AssignmentStmt) -> None:
for lvalue in s.lvalues:
self.store_declared_types(lvalue, s.type)

def is_annotated_protocol_member(self, s: AssignmentStmt) -> bool:
"""Check whether a protocol member is annotated.

There are some exceptions that can be left unannotated, like ``__slots__``."""
return any(
(
isinstance(lv, NameExpr)
and lv.name != '__slots__'
and lv.is_inferred_def
)
for lv in s.lvalues
)

def analyze_simple_literal_type(self, rvalue: Expression, is_final: bool) -> Optional[Type]:
"""Return builtins.int if rvalue is an int literal, etc.

Expand Down
8 changes: 8 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 @@ -2499,3 +2499,11 @@ reveal_type(abs(3)) # N: Revealed type is 'builtins.int*'
reveal_type(abs(ALL)) # N: Revealed type is 'builtins.int*'
[builtins fixtures/float.pyi]
[typing fixtures/typing-full.pyi]

[case testProtocolWithSlots]
from typing import Protocol

class A(Protocol):
__slots__ = ()

[builtins fixtures/tuple.pyi]