Merge pull request #791 from blink1073/more-typing

Author: blink1073

traitlets/config/application.py

@@ -17,6 +17,7 @@
 from copy import deepcopy
 from logging.config import dictConfig
 from textwrap import dedent
+from typing import Any, Callable, TypeVar, cast
 
 from traitlets.config.configurable import Configurable, SingletonConfigurable
 from traitlets.config.loader import (
@@ -94,8 +95,10 @@
 
 IS_PYTHONW = sys.executable and sys.executable.endswith("pythonw.exe")
 
+T = TypeVar("T", bound=Callable[..., Any])
 
-def catch_config_error(method):
+
+def catch_config_error(method: T) -> T:
     """Method decorator for catching invalid config (Trait/ArgumentErrors) during init.
 
     On a TraitError (generally caused by bad config), this will print the trait's
@@ -113,7 +116,7 @@ def inner(app, *args, **kwargs):
             app.log.debug("Config at the time: %s", app.config)
             app.exit(1)
 
-    return inner
+    return cast(T, inner)
 
 
 class ApplicationError(Exception):

traitlets/traitlets.py

@@ -981,7 +981,7 @@ def setup_class(cls, classdict):
         super().setup_class(classdict)
 
 
-def observe(*names, type="change"):
+def observe(*names: t.Union[Sentinel, str], type: str = "change") -> "ObserveHandler":
     """A decorator which can be used to observe Traits on a class.
 
     The handler passed to the decorator will be called with one ``change``
@@ -1047,7 +1047,7 @@ def compatible_observer(self, change_or_name, old=Undefined, new=Undefined):
     return compatible_observer
 
 
-def validate(*names):
+def validate(*names: t.Union[Sentinel, str]) -> "ValidateHandler":
     """A decorator to register cross validator of HasTraits object's state
     when a Trait is set.
 
@@ -1080,7 +1080,7 @@ def validate(*names):
     return ValidateHandler(names)
 
 
-def default(name):
+def default(name: str) -> "DefaultHandler":
     """A decorator which assigns a dynamic default for a Trait on a HasTraits object.
 
     Parameters

traitlets/utils/decorators.py

@@ -2,16 +2,20 @@
 
 import copy
 from inspect import Parameter, Signature, signature
+from typing import Type, TypeVar
 
-from ..traitlets import Undefined
+from ..traitlets import HasTraits, Undefined
 
 
 def _get_default(value):
     """Get default argument value, given the trait default value."""
     return Parameter.empty if value == Undefined else value
 
 
-def signature_has_traits(cls):
+T = TypeVar("T", bound=HasTraits)
+
+
+def signature_has_traits(cls: Type[T]) -> Type[T]:
     """Return a decorated class with a constructor signature that contain Trait names as kwargs."""
     traits = [
         (name, _get_default(value.default_value))
@@ -78,6 +82,6 @@ def signature_has_traits(cls):
     # Append **kwargs
     new_parameters.append(old_var_keyword_parameter)
 
-    cls.__signature__ = Signature(new_parameters)
+    cls.__signature__ = Signature(new_parameters)  # type:ignore[attr-defined]
 
     return cls