Replace Cls with type(self).

Author: dnwpark

tests/test_type_eval.py

@@ -21,7 +21,6 @@
 from typemap.typing import (
     Attrs,
     Bool,
-    Cls,
     FromUnion,
     GenericCallable,
     GetArg,
@@ -1517,14 +1516,14 @@ def static_method(x: int) -> int: ...
     """)
 
 
-def test_type_eval_cls_01():
-    res = eval_typing(Cls)
-    assert res == Cls
+def test_type_eval_type_self_01():
+    res = eval_typing(type(Self))
+    assert res is type(Self)
 
 
-def test_type_eval_cls_02():
+def test_type_eval_type_self_02():
     class A:
-        child: Cls | None
+        child: type(Self) | None
 
     class B(A):
         pass
@@ -1553,19 +1552,19 @@ class B(A):
     fmt = format_helper.format_class(A)
     assert fmt == textwrap.dedent("""\
         class A:
-            child: tests.test_type_eval.test_type_eval_cls_02.<locals>.A | None
+            child: tests.test_type_eval.test_type_eval_type_self_02.<locals>.A | None
     """)
     fmt = format_helper.format_class(B)
     assert fmt == textwrap.dedent("""\
         class B:
-            child: tests.test_type_eval.test_type_eval_cls_02.<locals>.B | None
+            child: tests.test_type_eval.test_type_eval_type_self_02.<locals>.B | None
     """)
 
 
-type ValueOrNone = GetAttr[Cls, Literal["value"]] | None
+type ValueOrNone = GetAttr[type(Self), Literal["value"]] | None
 
 
-def test_type_eval_cls_03():
+def test_type_eval_type_self_03():
     class A:
         value: int
         maybe: ValueOrNone
@@ -1595,7 +1594,7 @@ class A:
     """)
 
 
-def test_type_eval_cls_04():
+def test_type_eval_type_self_04():
     class A[T]:
         value: T
         maybe: ValueOrNone
@@ -1660,7 +1659,7 @@ class A[T]:
     )
 
 
-def test_type_eval_cls_05():
+def test_type_eval_type_self_05():
     class A:
         value: str
         maybe: ValueOrNone
@@ -1688,7 +1687,7 @@ class B:
     )
 
 
-def test_type_eval_cls_06():
+def test_type_eval_type_self_06():
     class A[T]:
         value: T
         maybe: ValueOrNone
@@ -1748,7 +1747,7 @@ class B[T, U]:
 )
 
 
-def test_type_eval_cls_07():
+def test_type_eval_type_self_07():
     class A:
         value: int
         maybe: ValueOrNone
@@ -1761,7 +1760,7 @@ class B:
     assert eval_typing(AttrSetOfOnlyInt[B, Literal["value"]]) is str
 
 
-def test_type_eval_cls_08():
+def test_type_eval_type_self_08():
     class A[T]:
         value: T
         maybe: ValueOrNone

typemap/type_eval/_eval_typing.py

@@ -320,14 +320,11 @@ def _get_class_type_hint_namespaces(
 
 @_eval_types_impl.register
 def _eval_type_type(obj: type, ctx: EvalContext):
-    from typemap.typing import Cls
-
-    # Special handling for Cls
-    if obj is Cls:
-        # If we are evaluating Cls, return the current class
+    if obj is type(typing.Self):
+        # If we are evaluating type(Self), return the current class
         if ctx.current_cls is not None:
             return ctx.current_cls
-        return Cls
+        return type(typing.Self)
 
     # Ensure that any string annotations are resolved
     if (

typemap/typing.py

@@ -175,10 +175,6 @@ class NewProtocol[*T]:
     pass
 
 
-class Cls:
-    pass
-
-
 ##################################################################
 
 # TODO: type better