More type annotations.

Author: jonathanslenders

examples/dialogs/button_dialog.py

@@ -16,7 +16,7 @@ def main():
  ('No', False),
  ('Maybe...', None),
  ],
- )
+ ).run()
 
  print('Result = {}'.format(result))
 

examples/dialogs/input_dialog.py

@@ -10,7 +10,7 @@
 def main():
  result = input_dialog(
  title='Input dialog example',
- text='Please type your name:')
+ text='Please type your name:').run()
 
  print('Result = {}'.format(result))
 

examples/dialogs/messagebox.py

@@ -10,7 +10,7 @@
 def main():
  message_dialog(
  title='Example dialog window',
- text='Do you want to continue?\nPress ENTER to quit.')
+ text='Do you want to continue?\nPress ENTER to quit.').run()
 
 
 if __name__ == '__main__':

examples/dialogs/password_dialog.py

@@ -11,7 +11,7 @@ def main():
  result = input_dialog(
  title='Password dialog example',
  text='Please type your password:',
- password=True)
+ password=True).run()
 
  print('Result = {}'.format(result))
 

examples/dialogs/progress_dialog.py

@@ -34,15 +34,14 @@ def worker(set_percentage, log_text):
  # Show 100% for a second, before quitting.
  set_percentage(100)
  time.sleep(1)
- return
 
 
 def main():
  progress_dialog(
  title='Progress dialog example',
  text='As an examples, we walk through the filesystem and print '
  'all directories',
- run_callback=worker)
+ run_callback=worker).run()
 
 
 if __name__ == '__main__':

examples/dialogs/radio_dialog.py

@@ -30,7 +30,7 @@ def main():
  ('orange', HTML('<style bg="orange" fg="white">Orange</style>')),
  ],
  title=HTML('Radiolist dialog example <reverse>with colors</reverse>'),
- text='Please select a color:')
+ text='Please select a color:').run()
 
  print('Result = {}'.format(result))
 

examples/dialogs/styled_messagebox.py

@@ -27,7 +27,7 @@ def main():
  title=HTML('<style bg="blue" fg="white">Styled</style> '
  '<style fg="ansired">dialog</style> window'),
  text='Do you want to continue?\nPress ENTER to quit.',
- style=example_style)
+ style=example_style).run()
 
 
 if __name__ == '__main__':

examples/dialogs/yes_no_dialog.py

@@ -10,7 +10,7 @@
 def main():
  result = yes_no_dialog(
  title='Yes/No dialog example',
- text='Do you want to confirm?')
+ text='Do you want to confirm?').run()
 
  print('Result = {}'.format(result))
 

examples/full-screen/text-editor.py

@@ -5,11 +5,11 @@
 from __future__ import unicode_literals
 
 import datetime
+from asyncio import Future, ensure_future
 
 from prompt_toolkit.application import Application
 from prompt_toolkit.application.current import get_app
 from prompt_toolkit.completion import PathCompleter
-from prompt_toolkit.eventloop import From, Future, Return, ensure_future
 from prompt_toolkit.filters import Condition
 from prompt_toolkit.key_binding import KeyBindings
 from prompt_toolkit.layout.containers import (
@@ -159,14 +159,14 @@ def _(event):
 #
 
 def do_open_file():
- def coroutine():
+ async def coroutine():
  global current_path
  open_dialog = TextInputDialog(
  title='Open file',
  label_text='Enter the path of a file:',
  completer=PathCompleter())
 
- path = yield From(show_dialog_as_float(open_dialog))
+ path = await show_dialog_as_float(open_dialog)
  current_path = path
 
  if path is not None:
@@ -184,9 +184,9 @@ def do_about():
 
 
 def show_message(title, text):
- def coroutine():
+ async def coroutine():
  dialog = MessageDialog(title, text)
- yield From(show_dialog_as_float(dialog))
+ await show_dialog_as_float(dialog)
 
  ensure_future(coroutine())
 
@@ -206,7 +206,7 @@ def show_dialog_as_float(dialog):
  if float_ in root_container.floats:
  root_container.floats.remove(float_)
 
- raise Return(result)
+ return result
 
 
 def do_new_file():
@@ -223,12 +223,12 @@ def do_time_date():
 
 
 def do_go_to():
- def coroutine():
+ async def coroutine():
  dialog = TextInputDialog(
  title='Go to line',
  label_text='Line number:')
 
- line_number = yield From(show_dialog_as_float(dialog))
+ line_number = await show_dialog_as_float(dialog)
 
  try:
  line_number = int(line_number)

prompt_toolkit/application/__init__.py

@@ -1,5 +1,11 @@
 from .application import Application
-from .current import NoRunningApplicationError, get_app, set_app
+from .current import (
+ NoRunningApplicationError,
+ get_app,
+ get_app_or_exception,
+ get_app_or_none,
+ set_app,
+)
 from .dummy import DummyApplication
 from .run_in_terminal import in_terminal, run_in_terminal
 
@@ -9,6 +15,8 @@
 
  # Current.
  'get_app',
+ 'get_app_or_none',
+ 'get_app_or_exception',
  'set_app',
  'NoRunningApplicationError',