Support prompt_toolkit 3.0.

Author: jonathanslenders

pyvim/editor_buffer.py

@@ -2,7 +2,7 @@
 from prompt_toolkit.application.current import get_app
 from prompt_toolkit.buffer import Buffer
 from prompt_toolkit.document import Document
-from prompt_toolkit.eventloop import call_from_executor, run_in_executor
+from prompt_toolkit import __version__ as ptk_version
 
 from pyvim.completion import DocumentCompleter
 from pyvim.reporting import report
@@ -12,6 +12,13 @@
 import os
 import weakref
 
+PTK3 = ptk_version.startswith('3.')
+
+if PTK3:
+    from asyncio import get_event_loop
+else:
+    from prompt_toolkit.eventloop import call_from_executor, run_in_executor
+
 __all__ = (
     'EditorBuffer',
 )
@@ -180,6 +187,9 @@ def run_reporter(self):
             # Better not to access the document in an executor.
             document = self.buffer.document
 
+            if PTK3:
+                loop = get_event_loop()
+
             def in_executor():
                 # Call reporter
                 report_errors = report(self.location, document)
@@ -196,5 +206,12 @@ def ready():
                         # Restart reporter when the text was changed.
                         self.run_reporter()
 
-                call_from_executor(ready)
-            run_in_executor(in_executor)
+                if PTK3:
+                    loop.call_soon_threadsafe(ready)
+                else:
+                    call_from_executor(ready)
+
+            if PTK3:
+                loop.run_in_executor(None, in_executor)
+            else:
+                run_in_executor(in_executor)

setup.py

@@ -17,7 +17,7 @@
     long_description=long_description,
     packages=find_packages('.'),
     install_requires = [
-        'prompt_toolkit>=2.0.0,<2.1.0',
+        'prompt_toolkit>=2.0.0,<3.1.0',
         'pyflakes',        # For Python error reporting.
         'pygments',        # For the syntax highlighting.
         'docopt',          # For command line arguments.