Changes for being compatible with the prompt-toolkit Callback refactoring.

Author: jonathanslenders

ptpython/history_browser.py

@@ -24,7 +24,6 @@
 from prompt_toolkit.layout.toolbars import ArgToolbar, SearchToolbar
 from prompt_toolkit.layout.toolbars import TokenListToolbar
 from prompt_toolkit.layout.utils import token_list_to_text
-from prompt_toolkit.utils import Callback
 from pygments.lexers import RstLexer
 from pygments.token import Token
 
@@ -530,7 +529,7 @@ def create_history_application(python_input, original_document):
     """
     history_mapping = HistoryMapping(python_input.history, original_document)
 
-    def default_buffer_pos_changed():
+    def default_buffer_pos_changed(_):
         """ When the cursor changes in the default buffer. Synchronize with
         history buffer. """
         # Only when this buffer has the focus.
@@ -549,7 +548,7 @@ def default_buffer_pos_changed():
                 history_buffer.cursor_position = \
                     history_buffer.document.translate_row_col_to_index(history_lineno, 0)
 
-    def history_buffer_pos_changed():
+    def history_buffer_pos_changed(_):
         """ When the cursor changes in the history buffer. Synchronize. """
         # Only when this buffer has the focus.
         if buffer_mapping.focus_stack[-1] == HISTORY_BUFFER:
@@ -564,14 +563,14 @@ def history_buffer_pos_changed():
 
     history_buffer = Buffer(
         initial_document=Document(history_mapping.concatenated_history),
-        on_cursor_position_changed=Callback(history_buffer_pos_changed),
+        on_cursor_position_changed=history_buffer_pos_changed,
         accept_action=AcceptAction(
             lambda cli, buffer: cli.set_return_value(default_buffer.document)),
         read_only=True)
 
     default_buffer = Buffer(
         initial_document=history_mapping.get_new_document(),
-        on_cursor_position_changed=Callback(default_buffer_pos_changed),
+        on_cursor_position_changed=default_buffer_pos_changed,
         read_only=True)
 
     help_buffer = Buffer(

ptpython/python_input.py

@@ -22,7 +22,7 @@
 from prompt_toolkit.layout.lexers import PygmentsLexer
 from prompt_toolkit.shortcuts import create_output
 from prompt_toolkit.styles import DynamicStyle
-from prompt_toolkit.utils import Callback, is_windows
+from prompt_toolkit.utils import is_windows
 from prompt_toolkit.validation import ConditionalValidator
 
 from .completer import PythonCompleter
@@ -520,9 +520,9 @@ def create_application(self):
             on_exit=self._on_exit,
             style=DynamicStyle(lambda: self._current_style),
             get_title=lambda: self.terminal_title,
-            on_initialize=Callback(self._on_cli_initialize),
+            on_initialize=self._on_cli_initialize,
             on_start=self._on_start,
-            on_input_timeout=Callback(self._on_input_timeout))
+            on_input_timeout=self._on_input_timeout)
 
     def _create_buffer(self):
         """
@@ -555,7 +555,7 @@ def _on_cli_initialize(self, cli):
         Called when a CommandLineInterface has been created.
         """
         # Synchronize PythonInput state with the CommandLineInterface.
-        def synchronize():
+        def synchronize(_=None):
             if self.vi_mode:
                 cli.editing_mode = EditingMode.VI
             else:

ptpython/repl.py

@@ -18,7 +18,7 @@
 from prompt_toolkit.layout.utils import token_list_width
 from prompt_toolkit.shortcuts import create_asyncio_eventloop
 from prompt_toolkit.styles import style_from_pygments
-from prompt_toolkit.utils import DummyContext, Callback
+from prompt_toolkit.utils import DummyContext
 
 from .python_input import PythonInput, PythonCommandLineInterface
 from .eventloop import create_eventloop
@@ -44,7 +44,7 @@ def __init__(self, *a, **kw):
         kw.update({
             '_accept_action': AcceptAction.run_in_terminal(
                 handler=self._process_document, render_cli_done=True),
-            '_on_start': Callback(self._on_start),
+            '_on_start': self._on_start,
             '_on_exit': AbortAction.RETURN_NONE,
         })