Make _apply_generic return a type instead of a dict

Author: msullivan

typemap/type_eval/_apply_generic.py

@@ -159,12 +159,26 @@ def make_func(
     return new_func
 
 
-def apply(cls: type[Any]) -> dict[str, Any]:
+def apply(
+    cls: type[Any], ctx: _eval_typing.EvalContext
+) -> type[_eval_typing._EvalProxy]:
     mro_boxed = compute_mro(cls)
 
     annos: dict[str, Any] = {}
     dct: dict[str, Any] = {}
 
+    # We create it early so we can add it to seen, to handle recursion
+    ctx.seen[cls] = ret = type(
+        cls.__name__,
+        (_eval_typing._EvalProxy,),
+        {
+            "__module__": cls.__module__,
+            "__name__": cls.__name__,
+            "__origin__": cls,
+        },
+    )
+
+    # Run through the mro
     for boxed in reversed(mro_boxed):
         if af := getattr(boxed.cls, "__annotate__", None):
             # Class has annotations, let's resolve generic arguments
@@ -235,11 +249,15 @@ def apply(cls: type[Any]) -> dict[str, Any]:
                     dct[name] = stuff
 
     for k, v in annos.items():
-        annos[k] = _eval_typing.eval_typing(v)
+        annos[k] = _eval_typing._eval_types(v, ctx=ctx)
 
     for k, v in dct.items():
-        dct[k] = _eval_typing.eval_typing(v)
+        dct[k] = _eval_typing._eval_types(v, ctx=ctx)
 
     dct["__annotations__"] = annos
     dct["__generalized_mro__"] = mro_boxed
-    return dct
+
+    for k, v in dct.items():
+        setattr(ret, k, v)
+
+    return ret

typemap/type_eval/_eval_typing.py

@@ -256,29 +256,13 @@ def _eval_func(
 @_eval_types_impl.register
 def _eval_type_type(obj: type, ctx: EvalContext):
     if isinstance(obj, type) and issubclass(obj, typing.Generic):
-        ret = type(
-            obj.__name__,
-            (_EvalProxy,),
-            {
-                "__module__": obj.__module__,
-                "__name__": obj.__name__,
-                "__origin__": obj,
-            },
-        )
-
-        # Need to add it to `seen` to handle recursion
-        ctx.seen[obj] = ret
         try:
-            ns = _apply_generic.apply(obj)
+            return _apply_generic.apply(obj, ctx)
         except Exception:
-            ctx.seen.pop(obj)
+            # XXX: should apply handle this?
+            ctx.seen.pop(obj, None)
             raise
 
-        for k, v in ns.items():
-            setattr(ret, k, v)
-
-        return ret
-
     return obj