improve type typing

ipython · Oct 29, 2023 · d2e6fdb · d2e6fdb
1 parent fdc6ae9
commit d2e6fdb
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 4 deletions.
diff --git a/tests/test_typing.py b/tests/test_typing.py
@@ -2,6 +2,7 @@
 
 import logging
 import typing as t
+from abc import ABC
 
 import pytest
 
@@ -128,6 +129,12 @@ def mypy_type_typing() -> None:
     class KernelSpec:
         item = Unicode("foo")
 
+    class KernelSpecSubclass(KernelSpec):
+        other = Unicode("bar")
+
+    class GatewayTokenRenewerBase(ABC):
+        item = Unicode("foo")
+
     class KernelSpecManager(HasTraits):
         """A manager for kernel specs."""
 
@@ -140,12 +147,30 @@ class KernelSpecManager(HasTraits):
         )
         other_class = Type("foo.bar.baz")
 
+        other_kernel_spec_class = Type(
+            default_value=KernelSpecSubclass,
+            klass=KernelSpec,
+            config=True,
+        )
+
+        gateway_token_renewer_class = Type(
+            klass=GatewayTokenRenewerBase,
+            config=True,
+            help="""The class to use for Gateway token renewal. (JUPYTER_GATEWAY_TOKEN_RENEWER_CLASS env var)""",
+        )
+
     t = KernelSpecManager()
-    reveal_type(t.kernel_spec_class)  # R: def () -> tests.test_typing.KernelSpec@128
-    reveal_type(t.kernel_spec_class())  # R: tests.test_typing.KernelSpec@128
+    reveal_type(t.kernel_spec_class)  # R: def () -> tests.test_typing.KernelSpec@129
+    reveal_type(t.kernel_spec_class())  # R: tests.test_typing.KernelSpec@129
     reveal_type(t.kernel_spec_class().item)  # R: builtins.str
     reveal_type(t.other_class)  # R: builtins.type
     reveal_type(t.other_class())  # R: Any
+    reveal_type(t.other_kernel_spec_class)  # R: def () -> tests.test_typing.KernelSpec@129
+    reveal_type(t.other_kernel_spec_class())  # R: tests.test_typing.KernelSpec@129
+    reveal_type(
+        t.gateway_token_renewer_class
+    )  # R: def () -> tests.test_typing.GatewayTokenRenewerBase@135
+    reveal_type(t.gateway_token_renewer_class())  # R: tests.test_typing.GatewayTokenRenewerBase@135
 
 
 @pytest.mark.mypy_testing

diff --git a/traitlets/traitlets.py b/traitlets/traitlets.py
@@ -2053,7 +2053,7 @@ def __init__(
         def __init__(
             self: Type[S, S],
             default_value: S = ...,
-            klass: type[S] = ...,
+            klass: S = ...,
             allow_none: Literal[False] = ...,
             read_only: bool | None = ...,
             help: str | None = ...,
@@ -2066,7 +2066,7 @@ def __init__(
         def __init__(
             self: Type[S | None, S | None],
             default_value: S | None = ...,
-            klass: type[S] = ...,
+            klass: S = ...,
             allow_none: Literal[True] = ...,
             read_only: bool | None = ...,
             help: str | None = ...,