From de2f6d151f15da5eb254b631e10b7547fb4e421b Mon Sep 17 00:00:00 2001 From: pei711 Date: Thu, 19 Nov 2026 10:16:50 +0000 Subject: [PATCH] Fix inference for bounded type object protocols --- mypy/constraints.py | 4 ++-- test-data/unit/check-protocols.test | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/mypy/constraints.py b/mypy/constraints.py index aa095316c234e..791db7e29a915 100644 --- a/mypy/constraints.py +++ b/mypy/constraints.py @@ -811,6 +811,8 @@ def visit_instance(self, template: Instance) -> list[Constraint]: if isinstance(actual, TypeType) and template.type.is_protocol: if self.direction == SUPERTYPE_OF: a_item = actual.item + if isinstance(a_item, TypeVarType): + a_item = get_proper_type(a_item.upper_bound) if isinstance(a_item, Instance): res.extend( self.infer_constraints_from_protocol_members( @@ -818,8 +820,6 @@ def visit_instance(self, template: Instance) -> list[Constraint]: ) ) # Infer constraints for Type[T] via metaclass of T when it makes sense. - if isinstance(a_item, TypeVarType): - a_item = get_proper_type(a_item.upper_bound) if isinstance(a_item, Instance) and a_item.type.metaclass_type: res.extend( self.infer_constraints_from_protocol_members( diff --git a/test-data/unit/check-protocols.test b/test-data/unit/check-protocols.test index 4c0fdd55b1224..b13a68cb5be5d 100644 --- a/test-data/unit/check-protocols.test +++ b/test-data/unit/check-protocols.test @@ -1,6 +1,29 @@ -- Simple protocol types -- --------------------- +[case testInferTypeVarBoundTypeObjectAgainstProtocol] +from typing import ClassVar, Protocol, TypeVar + +class Layout: ... + +L_co = TypeVar("L_co", bound=Layout, covariant=True) + +class HasLayout(Protocol[L_co]): + @property + def layout(self) -> L_co: ... + +class Table: + layout: ClassVar[Layout] + +T_co = TypeVar("T_co", bound=Table, covariant=True) + +def get_layout(cls: HasLayout[L_co]) -> L_co: + return cls.layout + +def generic(cls: type[T_co]) -> None: + reveal_type(get_layout(cls)) # N: Revealed type is "__main__.Layout" +[builtins fixtures/property.pyi] + [case testCannotInstantiateProtocol] from typing import Protocol