Revert "Simplify using has_no_typevars"

This reverts commit a945fe6.

Author: brianschubert

mypy/semanal.py

@@ -295,7 +295,7 @@
     type_vars_as_args,
 )
 from mypy.types_utils import is_invalid_recursive_alias, store_argument_type
-from mypy.typevars import fill_typevars, has_no_typevars
+from mypy.typevars import fill_typevars
 from mypy.util import correct_relative_import, is_dunder, module_prefix, unmangle, unnamed_function
 from mypy.visitor import NodeVisitor
 
@@ -2369,8 +2369,11 @@ def analyze_unbound_tvar_impl(
             assert isinstance(sym.node, TypeVarExpr)
             return t.name, sym.node
 
-    def find_type_var_likes(self, t: Type) -> TypeVarLikeList:
+    def find_type_var_likes(
+        self, t: Type, *, include_bound_tvars: bool = False
+    ) -> TypeVarLikeList:
         visitor = FindTypeVarVisitor(self, self.tvar_scope)
+        visitor.include_bound_tvars = include_bound_tvars
         t.accept(visitor)
         return visitor.type_var_likes
 
@@ -5036,25 +5039,21 @@ def analyze_value_types(self, items: list[Expression]) -> list[Type]:
         result: list[Type] = []
         for node in items:
             try:
-                analyzed = self.anal_type(
-                    self.expr_to_unanalyzed_type(node), allow_placeholder=True
-                )
+                unanalyzed_type = self.expr_to_unanalyzed_type(node)
+                if self.find_type_var_likes(unanalyzed_type, include_bound_tvars=True):
+                    self.fail(
+                        "TypeVar constraint type cannot be parametrized by type variables", node
+                    )
+                    result.append(AnyType(TypeOfAny.from_error))
+                    continue
+
+                analyzed = self.anal_type(unanalyzed_type, allow_placeholder=True)
                 if analyzed is None:
                     # Type variables are special: we need to place them in the symbol table
                     # soon, even if some value is not ready yet, see process_typevar_parameters()
                     # for an example.
                     analyzed = PlaceholderType(None, [], node.line)
-
-                # has_no_typevars does not work with PlaceholderType.
-                if not isinstance(
-                    get_proper_type(analyzed), PlaceholderType
-                ) and not has_no_typevars(analyzed):
-                    self.fail(
-                        "TypeVar constraint type cannot be parametrized by type variables", node
-                    )
-                    result.append(AnyType(TypeOfAny.from_error))
-                else:
-                    result.append(analyzed)
+                result.append(analyzed)
             except TypeTranslationError:
                 self.fail("Type expected", node)
                 result.append(AnyType(TypeOfAny.from_error))

mypy/typeanal.py

@@ -2558,6 +2558,7 @@ def __init__(self, api: SemanticAnalyzerCoreInterface, scope: TypeVarLikeScope)
         self.has_self_type = False
         self.seen_aliases: set[TypeAliasType] | None = None
         self.include_callables = True
+        self.include_bound_tvars = False
 
     def _seems_like_callable(self, type: UnboundType) -> bool:
         if not type.args:
@@ -2583,7 +2584,7 @@ def visit_unbound_type(self, t: UnboundType) -> None:
         if (
             node
             and isinstance(node.node, TypeVarLikeExpr)
-            and self.scope.get_binding(node) is None
+            and (self.scope.get_binding(node) is None or self.include_bound_tvars)
         ):
             if (name, node.node) not in self.type_var_likes:
                 self.type_var_likes.append((name, node.node))

test-data/unit/semanal-errors.test

@@ -1065,10 +1065,13 @@ from typing import Generic, List, TypeVar
 
 T = TypeVar("T")
 
+Bad1 = TypeVar("Bad1", int, T)              # E: TypeVar constraint type cannot be parametrized by type variables
+Bad2 = TypeVar("Bad2", int, List[T])        # E: TypeVar constraint type cannot be parametrized by type variables
+Bad3 = TypeVar("Bad3", int, List[List[T]])  # E: TypeVar constraint type cannot be parametrized by type variables
 def f(x: T) -> None:
-    Bad = TypeVar("Bad", int, List[T])    # E: TypeVar constraint type cannot be parametrized by type variables
+    Bad4 = TypeVar("Bad4", int, List[T])    # E: TypeVar constraint type cannot be parametrized by type variables
 class C(Generic[T]):
-    Bad = TypeVar("Bad", int, List[T])    # E: TypeVar constraint type cannot be parametrized by type variables
+    Bad5 = TypeVar("Bad5", int, List[T])    # E: TypeVar constraint type cannot be parametrized by type variables
 
 [case testInvalidTypevarValues]
 from typing import TypeVar