prompt-toolkit compatibility: CommandLineInterface now expects an eventloop in __init__.

jonathanslenders · jonathanslenders · commit d59807a10e69 · 2015-04-12T14:09:33.000+01:00
diff --git a/examples/python-input.py b/examples/python-input.py
@@ -3,14 +3,19 @@
 """
 from __future__ import unicode_literals
 
+from prompt_toolkit.contrib.shortcuts import create_eventloop
 from ptpython.python_input import PythonCommandLineInterface
 
 
 def main():
-    cli = PythonCommandLineInterface()
+    eventloop = create_eventloop()
+    try:
+        cli = PythonCommandLineInterface(eventloop)
 
-    code_obj = cli.cli.read_input()
-    print('You said: ' + code_obj.text)
+        code_obj = cli.cli.read_input()
+        print('You said: ' + code_obj.text)
+    finally:
+        eventloop.close()
 
 
 if __name__ == '__main__':
diff --git a/ptpython/ipython.py b/ptpython/ipython.py
@@ -15,6 +15,7 @@
 from prompt_toolkit.contrib.regular_languages.compiler import compile
 from prompt_toolkit.contrib.regular_languages.completion import GrammarCompleter
 from prompt_toolkit.contrib.regular_languages.lexer import GrammarLexer
+from prompt_toolkit.contrib.shortcuts import create_eventloop
 from prompt_toolkit.document import Document
 from prompt_toolkit.layout.controls import TokenListControl
 
@@ -168,8 +169,11 @@ def __init__(self, *a, **kw):
         def get_globals():
             return self.user_ns
 
+        self._eventloop = create_eventloop()
         self._cli = IPythonCommandLineInterface(
-            self, get_globals=get_globals, vi_mode=vi_mode,
+            self,
+            eventloop=self._eventloop,
+            get_globals=get_globals, vi_mode=vi_mode,
             history_filename=history_filename)
 
     def raw_input(self, prompt=''):
diff --git a/ptpython/python_input.py b/ptpython/python_input.py
@@ -75,6 +75,7 @@ def __init__(self, paste_mode=False):
 
 class PythonCommandLineInterface(object):
     def __init__(self,
+                 eventloop,
                  get_globals=None, get_locals=None,
                  stdin=None, stdout=None,
                  vi_mode=False, history_filename=None,
@@ -120,6 +121,7 @@ def __init__(self,
         buffers.update(_extra_buffers or {})
 
         self.cli = CommandLineInterface(
+            eventloop=eventloop,
             style=style,
             key_bindings_registry=self.key_bindings_manager.registry,
             buffers=buffers,
diff --git a/ptpython/repl.py b/ptpython/repl.py
@@ -17,6 +17,7 @@
 from pygments.lexers import PythonTracebackLexer
 
 from prompt_toolkit.utils import DummyContext
+from prompt_toolkit.contrib.shortcuts import create_eventloop, create_asyncio_eventloop
 
 from ptpython.python_input import PythonCommandLineInterface, PythonStyle
 
@@ -54,7 +55,7 @@ def asyncio_start_repl(self):
         """
         (coroutine) Start a Read-Eval-print Loop for usage in asyncio. E.g.::
 
-            repl = PythonRepl(get_globals=lambda:globals())
+            repl = PythonRepl(eventloop, get_globals=lambda:globals())
             yield from repl.asyncio_start_repl()
         """
         try:
@@ -187,9 +188,18 @@ def get_globals():
     def get_locals():
         return locals
 
-    repl = PythonRepl(get_globals, get_locals, vi_mode=vi_mode, history_filename=history_filename,
+    # Create eventloop.
+    if return_asyncio_coroutine:
+        eventloop = create_asyncio_eventloop()
+    else:
+        eventloop = create_eventloop()
+
+    # Create REPL.
+    repl = PythonRepl(eventloop, get_globals, get_locals, vi_mode=vi_mode,
+                      history_filename=history_filename,
                       style=(None if no_colors else PythonStyle))
 
+    # Start repl.
     patch_context = repl.cli.patch_stdout_context() if patch_stdout else DummyContext()
 
     if return_asyncio_coroutine:
