Improved a few type annotations.

Author: jonathanslenders

prompt_toolkit/application/dummy.py

@@ -1,4 +1,4 @@
-from typing import Any, Callable, Optional
+from typing import Callable, Optional
 
 from prompt_toolkit.input import DummyInput
 from prompt_toolkit.output import DummyOutput
@@ -10,7 +10,7 @@
 ]
 
 
-class DummyApplication(Application):
+class DummyApplication(Application[None]):
     """
     When no :class:`.Application` is running,
     :func:`.get_app` will run an instance of this :class:`.DummyApplication` instead.
@@ -19,10 +19,10 @@ def __init__(self) -> None:
         super().__init__(output=DummyOutput(), input=DummyInput())
 
     def run(self, pre_run: Optional[Callable[[], None]] = None,
-            set_exception_handler: bool = True) -> Any:
+            set_exception_handler: bool = True) -> None:
         raise NotImplementedError('A DummyApplication is not supposed to run.')
 
-    async def run_async(self, pre_run: Optional[Callable[[], None]] = None) -> Any:
+    async def run_async(self, pre_run: Optional[Callable[[], None]] = None) -> None:
         raise NotImplementedError('A DummyApplication is not supposed to run.')
 
     async def run_system_command(

prompt_toolkit/layout/controls.py

@@ -5,9 +5,9 @@
 from abc import ABCMeta, abstractmethod
 from typing import (
     TYPE_CHECKING,
-    Any,
     Callable,
     Dict,
+    Hashable,
     Iterable,
     List,
     NamedTuple,
@@ -175,7 +175,7 @@ def __init__(self,
         self.show_cursor = show_cursor
 
         # Cache for line heights. Maps cache key -> height
-        self._line_heights_cache: Dict[Any, int] = {}
+        self._line_heights_cache: Dict[Hashable, int] = {}
 
     def __getitem__(self, lineno: int) -> StyleAndTextTuples:
         " Make it iterable (iterate line by line). "
@@ -317,7 +317,7 @@ def __init__(
         self.get_cursor_position = get_cursor_position
 
         #: Cache for the content.
-        self._content_cache: SimpleCache[Any, UIContent] = SimpleCache(maxsize=18)
+        self._content_cache: SimpleCache[Hashable, UIContent] = SimpleCache(maxsize=18)
         self._fragment_cache: SimpleCache[int, StyleAndTextTuples] = SimpleCache(maxsize=1)
             # Only cache one fragment list. We don't need the previous item.
 
@@ -533,7 +533,7 @@ def __init__(
         #: Often, due to cursor movement, undo/redo and window resizing
         #: operations, it happens that a short time, the same document has to be
         #: lexed. This is a fairly easy way to cache such an expensive operation.
-        self._fragment_cache: SimpleCache[Any, Callable[[int], StyleAndTextTuples]] = \
+        self._fragment_cache: SimpleCache[Hashable, Callable[[int], StyleAndTextTuples]] = \
             SimpleCache(maxsize=8)
 
         self._last_click_timestamp: Optional[float] = None

prompt_toolkit/renderer.py

@@ -311,7 +311,7 @@ def __init__(
         self._bracketed_paste_enabled = False
 
         # Future set when we are waiting for a CPR flag.
-        self._waiting_for_cpr_futures: Deque[Future] = deque()
+        self._waiting_for_cpr_futures: Deque[Future[None]] = deque()
         self.cpr_support = CPR_Support.UNKNOWN
         if not input.responds_to_cpr:
             self.cpr_support = CPR_Support.NOT_SUPPORTED