Typing fixes.

Author: jonathanslenders

prompt_toolkit/application/dummy.py

@@ -22,7 +22,8 @@ def run(self, pre_run: Optional[Callable[[], None]] = None,
  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) -> None:
+ async def run_async(self, pre_run: Optional[Callable[[], None]] = None,
+ set_exception_handler: bool = True) -> None:
  raise NotImplementedError('A DummyApplication is not supposed to run.')
 
  async def run_system_command(

prompt_toolkit/completion/nested.py

@@ -1,7 +1,7 @@
 """
 Nestedcompleter for completion of hierarchical data structures.
 """
-from typing import Dict, Iterable, Mapping, Optional, Set, Union
+from typing import Any, Dict, Iterable, Mapping, Optional, Set, Union
 
 from prompt_toolkit.completion import CompleteEvent, Completer, Completion
 from prompt_toolkit.completion.word_completer import WordCompleter
@@ -11,7 +11,8 @@
  'NestedCompleter'
 ]
 
-NestedDict = Mapping[str, Union['NestedDict', Set[str], None, Completer]]
+# NestedDict = Mapping[str, Union['NestedDict', Set[str], None, Completer]]
+NestedDict = Mapping[str, Union[Any, Set[str], None, Completer]]
 
 
 class NestedCompleter(Completer):

prompt_toolkit/key_binding/bindings/emacs.py

@@ -1,4 +1,6 @@
 # pylint: disable=function-redefined
+from typing import Dict, Union
+
 from prompt_toolkit.application.current import get_app
 from prompt_toolkit.buffer import Buffer, SelectionType, indent, unindent
 from prompt_toolkit.completion import CompleteEvent
@@ -14,6 +16,7 @@
  shift_selection_mode,
  vi_search_direction_reversed,
 )
+from prompt_toolkit.key_binding.key_bindings import Binding
 from prompt_toolkit.key_binding.key_processor import KeyPressEvent
 from prompt_toolkit.keys import Keys
 
@@ -395,7 +398,7 @@ def unshift_move(event: E) -> None:
  return
 
  # the other keys are handled through their readline command
- key_to_command = {
+ key_to_command: Dict[Union[Keys, str], str] = {
  Keys.ShiftLeft: 'backward-char',
  Keys.ShiftRight: 'forward-char',
  Keys.ShiftHome: 'beginning-of-line',
@@ -412,7 +415,10 @@ def unshift_move(event: E) -> None:
  except KeyError:
  pass
  else: # (`else` is not really needed here.)
- handler(event)
+ if not isinstance(handler, Binding):
+ # (It should always be a normal callable here, for these
+ # commands.)
+ handler(event)
 
  @handle('s-left', filter= ~has_selection)
  @handle('s-right', filter= ~has_selection)

prompt_toolkit/layout/utils.py

@@ -47,7 +47,7 @@ def __setitem__(self, index: Union[int, slice], value: Union[_T, Iterable[_T]])
  if isinstance(value, tuple): # In case of `OneStyleAndTextTuple`.
  value = cast('List[_T]', [value])
 
- super().__setitem__(index, explode_text_fragments(value))
+ super().__setitem__(index, explode_text_fragments(cast('Iterable[_T]', value)))
 
 
 def explode_text_fragments(fragments: Iterable[_T]) -> _ExplodedList[_T]: