Using DynamicStyle and Container: changes for the latest prompt-toolkit.

Author: jonathanslenders

ptpython/history_browser.py

@@ -13,7 +13,7 @@
 from prompt_toolkit.filters import Always, Condition, HasFocus, InFocusStack
 from prompt_toolkit.key_binding.manager import KeyBindingManager
 from prompt_toolkit.keys import Keys
-from prompt_toolkit.layout.containers import HSplit, VSplit, Window, FloatContainer, Float, ConditionalContainer, Layout, ScrollOffsets
+from prompt_toolkit.layout.containers import HSplit, VSplit, Window, FloatContainer, Float, ConditionalContainer, Container, ScrollOffsets
 from prompt_toolkit.layout.controls import BufferControl, FillControl
 from prompt_toolkit.layout.dimension import LayoutDimension as D
 from prompt_toolkit.layout.lexers import PygmentsLexer
@@ -104,7 +104,7 @@ def create_popup_window(title, body):
     the `title` text, and a body layout. The window is surrounded by borders.
     """
     assert isinstance(title, six.text_type)
-    assert isinstance(body, Layout)
+    assert isinstance(body, Container)
 
     return HSplit([
         VSplit([
@@ -137,7 +137,8 @@ def create_popup_window(title, body):
 
 def create_layout(python_input, history_mapping):
     """
-    Create and return a `Layout` instance for the history application.
+    Create and return a `Container` instance for the history
+    application.
     """
     default_processors = [
         HighlightSearchProcessor(preview_search=Always()),

ptpython/python_input.py

@@ -10,6 +10,7 @@
 from __future__ import unicode_literals
 
 from prompt_toolkit import AbortAction
+from prompt_toolkit.auto_suggest import AutoSuggestFromHistory, ConditionalAutoSuggest
 from prompt_toolkit.buffer import Buffer
 from prompt_toolkit.document import Document
 from prompt_toolkit.enums import DEFAULT_BUFFER
@@ -18,9 +19,9 @@
 from prompt_toolkit.interface import CommandLineInterface, Application, AcceptAction
 from prompt_toolkit.key_binding.manager import KeyBindingManager
 from prompt_toolkit.layout.lexers import PygmentsLexer
+from prompt_toolkit.styles import DynamicStyle
 from prompt_toolkit.utils import Callback, is_windows
 from prompt_toolkit.validation import ConditionalValidator
-from prompt_toolkit.auto_suggest import AutoSuggestFromHistory, ConditionalAutoSuggest
 
 from ptpython.completer import PythonCompleter
 from ptpython.key_bindings import load_python_bindings, load_sidebar_bindings, load_confirm_exit_bindings
@@ -506,7 +507,7 @@ def create_application(self):
             mouse_support=Condition(lambda cli: self.enable_mouse_support),
             on_abort=AbortAction.RETRY,
             on_exit=self._on_exit,
-            get_style=lambda: self._current_style,
+            style=DynamicStyle(lambda: self._current_style),
             get_title=lambda: self.terminal_title,
             on_start=self._on_start,
             on_input_timeout=Callback(self._on_input_timeout))

ptpython/repl.py

@@ -18,6 +18,7 @@
 from prompt_toolkit.shortcuts import create_asyncio_eventloop
 from prompt_toolkit.utils import DummyContext, Callback
 from prompt_toolkit.enums import DEFAULT_BUFFER
+from prompt_toolkit.styles import PygmentsStyle
 
 from .python_input import PythonInput
 from .eventloop import create_eventloop
@@ -162,7 +163,7 @@ def _handle_exception(cls, cli, e):
         # (We use the default style. Most other styles result
         # in unreadable colors for the traceback.)
         tokens = _lex_python_traceback(tb)
-        cli.print_tokens(tokens, style=DefaultStyle)
+        cli.print_tokens(tokens, style=PygmentsStyle(DefaultStyle))
 
         output.write('%s\n\n' % e)
         output.flush()

ptpython/style.py

@@ -3,7 +3,7 @@
 from pygments.token import Token, Keyword, Name, Comment, String, Operator, Number
 from pygments.style import Style
 from pygments.styles import get_style_by_name, get_all_styles
-from prompt_toolkit.styles import default_style_extensions
+from prompt_toolkit.styles import default_style_extensions, PygmentsStyle
 from prompt_toolkit.utils import is_windows, is_conemu_ansi
 
 __all__ = (
@@ -46,7 +46,7 @@ class PythonStyle(Style):
         styles.update(python_style)
         styles.update(ui_style)
 
-    return PythonStyle
+    return PygmentsStyle(PythonStyle)
 
 
 # Code style for Windows consoles. They support only 16 colors,

setup.py

@@ -19,7 +19,7 @@
     long_description=long_description,
     packages=find_packages('.'),
     install_requires = [
-        'prompt_toolkit==0.52',
+        'prompt_toolkit==0.53',
         'jedi>=0.9.0',
         'docopt',
     ],