Skip to content

Handle Self wrapped in Annotated when checking the expected self type #21928

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

Open
EmmanuelNiyonshuti wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −0
Open

Handle Self wrapped in Annotated when checking the expected self type #21928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions mypy/semanal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@
)
from mypy.typeops import function_type, get_type_vars, try_getting_str_literals_from_type
from mypy.types import (
ANNOTATED_TYPE_NAMES,
ASSERT_TYPE_NAMES,
DATACLASS_TRANSFORM_NAMES,
DEPRECATED_TYPE_NAMES,
Expand Down Expand Up @@ -1195,6 +1196,8 @@ def is_expected_self_type(self, typ: Type, is_classmethod: bool) -> bool:
return typ == self.type.self_type
if isinstance(typ, UnboundType):
sym = self.lookup_qualified(typ.name, typ, suppress_errors=True)
if sym is not None and sym.fullname in ANNOTATED_TYPE_NAMES and typ.args:
return self.is_expected_self_type(typ.args[0], is_classmethod=False)
return sym is not None and sym.fullname in SELF_TYPE_NAMES
return False

Expand Down
13 changes: 13 additions & 0 deletions test-data/unit/check-selftype.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1549,6 +1549,19 @@ reveal_type(D.meth()) # N: Revealed type is "__main__.D"
reveal_type(D.bad()) # N: Revealed type is "Never"
[builtins fixtures/classmethod.pyi]

[case testTypingSelfAnnotatedType]
# See: https://github.com/python/mypy/issues/21917

from typing import Self
from typing_extensions import Annotated

class C:
def foo(self: Annotated[Self, "some_metadata"], x: int) -> None:
...

reveal_type(C.foo) # N: Revealed type is "def [Self <: __main__.C] (self: Self`2, x: builtins.int)"
[builtins fixtures/tuple.pyi]

[case testTypingSelfOverload]
from typing import Self, overload, Union

Expand Down
Loading