Fix some typing issues

Author: cdce8p

mypy/constraints.py

@@ -329,7 +329,7 @@ def _infer_constraints(
     if isinstance(actual, UnionType):
         actual = mypy.typeops.make_simplified_union(actual.items, keep_erased=True)
     if isinstance(actual, TypeVarType) and actual.has_default():
-        actual = actual.default
+        actual = get_proper_type(actual.default)
 
     # Ignore Any types from the type suggestion engine to avoid them
     # causing us to infer Any in situations where a better job could

mypy/tvar_scope.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from copy import copy
-from typing import Generator
+from typing import Iterator
 
 from mypy.nodes import (
     ParamSpecExpr,
@@ -10,7 +10,7 @@
     TypeVarLikeExpr,
     TypeVarTupleExpr,
 )
-from mypy.type_visitor import SyntheticTypeVisitor, T
+from mypy.type_visitor import SyntheticTypeVisitor
 from mypy.types import (
     AnyType,
     CallableArgument,
@@ -44,93 +44,93 @@
 )
 
 
-class TypeVarLikeYielder(SyntheticTypeVisitor[Generator[TypeVarLikeType, None, None]]):
+class TypeVarLikeYielder(SyntheticTypeVisitor[Iterator[TypeVarLikeType]]):
     """Yield all TypeVarLikeTypes in a type."""
 
-    def visit_type_var(self, t: TypeVarType) -> Generator[TypeVarLikeType, None, None]:
+    def visit_type_var(self, t: TypeVarType) -> Iterator[TypeVarLikeType]:
         yield t
 
-    def visit_type_var_tuple(self, t: TypeVarTupleType) -> Generator[TypeVarLikeType, None, None]:
+    def visit_type_var_tuple(self, t: TypeVarTupleType) -> Iterator[TypeVarLikeType]:
         yield t
 
-    def visit_param_spec(self, t: ParamSpecType) -> Generator[TypeVarLikeType, None, None]:
+    def visit_param_spec(self, t: ParamSpecType) -> Iterator[TypeVarLikeType]:
         yield t
 
-    def visit_callable_type(self, t: CallableType) -> Generator[TypeVarLikeType, None, None]:
+    def visit_callable_type(self, t: CallableType) -> Iterator[TypeVarLikeType]:
         for arg in t.arg_types:
             yield from arg.accept(self)
         yield from t.ret_type.accept(self)
 
-    def visit_instance(self, t: Instance) -> Generator[TypeVarLikeType, None, None]:
+    def visit_instance(self, t: Instance) -> Iterator[TypeVarLikeType]:
         for arg in t.args:
             yield from arg.accept(self)
 
-    def visit_overloaded(self, t: Overloaded) -> Generator[TypeVarLikeType, None, None]:
+    def visit_overloaded(self, t: Overloaded) -> Iterator[TypeVarLikeType]:
         for item in t.items:
             yield from item.accept(self)
 
-    def visit_tuple_type(self, t: TupleType) -> Generator[TypeVarLikeType, None, None]:
+    def visit_tuple_type(self, t: TupleType) -> Iterator[TypeVarLikeType]:
         for item in t.items:
             yield from item.accept(self)
 
-    def visit_type_alias_type(self, t: TypeAliasType) -> Generator[TypeVarLikeType, None, None]:
+    def visit_type_alias_type(self, t: TypeAliasType) -> Iterator[TypeVarLikeType]:
         for arg in t.args:
             yield from arg.accept(self)
 
-    def visit_typeddict_type(self, t: TypedDictType) -> Generator[TypeVarLikeType, None, None]:
+    def visit_typeddict_type(self, t: TypedDictType) -> Iterator[TypeVarLikeType]:
         for arg in t.items.values():
             yield from arg.accept(self)
 
-    def visit_union_type(self, t: UnionType) -> Generator[TypeVarLikeType, None, None]:
+    def visit_union_type(self, t: UnionType) -> Iterator[TypeVarLikeType]:
         for arg in t.items:
             yield from arg.accept(self)
 
-    def visit_type_type(self, t: TypeType) -> T:
+    def visit_type_type(self, t: TypeType) -> Iterator[TypeVarLikeType]:
         yield from t.item.accept(self)
 
-    def visit_type_list(self, t: TypeList) -> T:
+    def visit_type_list(self, t: TypeList) -> Iterator[TypeVarLikeType]:
         yield from ()
 
-    def visit_callable_argument(self, t: CallableArgument) -> T:
+    def visit_callable_argument(self, t: CallableArgument) -> Iterator[TypeVarLikeType]:
         yield from ()
 
-    def visit_ellipsis_type(self, t: EllipsisType) -> T:
+    def visit_ellipsis_type(self, t: EllipsisType) -> Iterator[TypeVarLikeType]:
         yield from ()
 
-    def visit_raw_expression_type(self, t: RawExpressionType) -> T:
+    def visit_raw_expression_type(self, t: RawExpressionType) -> Iterator[TypeVarLikeType]:
         yield from ()
 
-    def visit_unbound_type(self, t: UnboundType) -> T:
+    def visit_unbound_type(self, t: UnboundType) -> Iterator[TypeVarLikeType]:
         yield from ()
 
-    def visit_none_type(self, t: NoneType) -> T:
+    def visit_none_type(self, t: NoneType) -> Iterator[TypeVarLikeType]:
         yield from ()
 
-    def visit_uninhabited_type(self, t: UninhabitedType) -> T:
+    def visit_uninhabited_type(self, t: UninhabitedType) -> Iterator[TypeVarLikeType]:
         yield from ()
 
-    def visit_erased_type(self, t: ErasedType) -> T:
+    def visit_erased_type(self, t: ErasedType) -> Iterator[TypeVarLikeType]:
         yield from ()
 
-    def visit_deleted_type(self, t: DeletedType) -> T:
+    def visit_deleted_type(self, t: DeletedType) -> Iterator[TypeVarLikeType]:
         yield from ()
 
-    def visit_parameters(self, t: Parameters) -> T:
+    def visit_parameters(self, t: Parameters) -> Iterator[TypeVarLikeType]:
         yield from ()
 
-    def visit_literal_type(self, t: LiteralType) -> T:
+    def visit_literal_type(self, t: LiteralType) -> Iterator[TypeVarLikeType]:
         yield from ()
 
-    def visit_partial_type(self, t: PartialType) -> T:
+    def visit_partial_type(self, t: PartialType) -> Iterator[TypeVarLikeType]:
         yield from ()
 
-    def visit_unpack_type(self, t: UnpackType) -> T:
+    def visit_unpack_type(self, t: UnpackType) -> Iterator[TypeVarLikeType]:
         yield from ()
 
-    def visit_any(self, t: AnyType) -> Generator[TypeVarLikeType, None, None]:
+    def visit_any(self, t: AnyType) -> Iterator[TypeVarLikeType]:
         yield from ()
 
-    def visit_placeholder_type(self, t: PlaceholderType) -> Generator[TypeVarLikeType, None, None]:
+    def visit_placeholder_type(self, t: PlaceholderType) -> Iterator[TypeVarLikeType]:
         yield from ()