Fixed python-embed-with-custom-prompt example.

jonathanslenders · jonathanslenders · commit 7346416270bc · 2020-04-14T16:53:31.000+02:00
diff --git a/examples/python-embed-with-custom-prompt.py b/examples/python-embed-with-custom-prompt.py
@@ -5,46 +5,32 @@
 from __future__ import unicode_literals
 
 from pygments.token import Token
+from prompt_toolkit.formatted_text import HTML
 
 from ptpython.prompt_style import PromptStyle
 from ptpython.repl import embed
 
 
 def configure(repl):
-    # There are several ways to override the prompt.
-
-    # 1. Probably, the best is to add a new PromptStyle to `all_prompt_styles`
-    #    and activate it. This way, the other styles are still selectable from
-    #    the menu.
+    # Probably, the best is to add a new PromptStyle to `all_prompt_styles` and
+    # activate it. This way, the other styles are still selectable from the
+    # menu.
     class CustomPrompt(PromptStyle):
-        def in_tokens(self, cli):
-            return [
-                (Token.In, "Input["),
-                (Token.In.Number, "%s" % repl.current_statement_index),
-                (Token.In, "] >>: "),
-            ]
-
-        def in2_tokens(self, cli, width):
-            return [(Token.In, "...: ".rjust(width))]
-
-        def out_tokens(self, cli):
-            return [
-                (Token.Out, "Result["),
-                (Token.Out.Number, "%s" % repl.current_statement_index),
-                (Token.Out, "]: "),
-            ]
-
-    repl.all_prompt_styles["custom"] = CustomPrompt()
-    repl.prompt_style = "custom"
+        def in_prompt(self):
+            return HTML("<ansigreen>Input[%s]</ansigreen>: ") % (
+                repl.current_statement_index,
+            )
 
-    # 2. Assign a new callable to `get_input_prompt_tokens`. This will always take effect.
-    ## repl.get_input_prompt_tokens = lambda cli: [(Token.In, '[hello] >>> ')]
+        def in2_prompt(self, width):
+            return "...: ".rjust(width)
 
-    # 3. Also replace `get_input_prompt_tokens`, but still call the original. This inserts
-    #    a prefix.
+        def out_prompt(self):
+            return HTML("<ansired>Result[%s]</ansired>: ") % (
+                repl.current_statement_index,
+            )
 
-    ## original = repl.get_input_prompt_tokens
-    ## repl.get_input_prompt_tokens = lambda cli: [(Token.In, '[prefix]')] + original(cli)
+    repl.all_prompt_styles["custom"] = CustomPrompt()
+    repl.prompt_style = "custom"
 
 
 def main():
diff --git a/ptpython/completer.py b/ptpython/completer.py
@@ -129,7 +129,7 @@ def get_completions(
             for c in self.dictionary_completer.get_completions(
                 document, complete_event
             ):
-                if c.text not in '[.':
+                if c.text not in "[.":
                     # If we get the [ or . completion, still include the other
                     # completions.
                     has_dict_completions = True
diff --git a/ptpython/prompt_style.py b/ptpython/prompt_style.py
@@ -1,7 +1,7 @@
 from abc import ABCMeta, abstractmethod
 from typing import TYPE_CHECKING
 
-from prompt_toolkit.formatted_text import StyleAndTextTuples
+from prompt_toolkit.formatted_text import AnyFormattedText
 
 if TYPE_CHECKING:
     from .python_input import PythonInput
@@ -15,12 +15,12 @@ class PromptStyle(metaclass=ABCMeta):
     """
 
     @abstractmethod
-    def in_prompt(self) -> StyleAndTextTuples:
+    def in_prompt(self) -> AnyFormattedText:
         " Return the input tokens. "
         return []
 
     @abstractmethod
-    def in2_prompt(self, width: int) -> StyleAndTextTuples:
+    def in2_prompt(self, width: int) -> AnyFormattedText:
         """
         Tokens for every following input line.
 
@@ -30,7 +30,7 @@ def in2_prompt(self, width: int) -> StyleAndTextTuples:
         return []
 
     @abstractmethod
-    def out_prompt(self) -> StyleAndTextTuples:
+    def out_prompt(self) -> AnyFormattedText:
         " Return the output tokens. "
         return []
 
@@ -43,17 +43,17 @@ class IPythonPrompt(PromptStyle):
     def __init__(self, python_input: "PythonInput") -> None:
         self.python_input = python_input
 
-    def in_prompt(self) -> StyleAndTextTuples:
+    def in_prompt(self) -> AnyFormattedText:
         return [
             ("class:in", "In ["),
             ("class:in.number", "%s" % self.python_input.current_statement_index),
             ("class:in", "]: "),
         ]
 
-    def in2_prompt(self, width: int) -> StyleAndTextTuples:
+    def in2_prompt(self, width: int) -> AnyFormattedText:
         return [("class:in", "...: ".rjust(width))]
 
-    def out_prompt(self) -> StyleAndTextTuples:
+    def out_prompt(self) -> AnyFormattedText:
         return [
             ("class:out", "Out["),
             ("class:out.number", "%s" % self.python_input.current_statement_index),
@@ -67,11 +67,11 @@ class ClassicPrompt(PromptStyle):
     The classic Python prompt.
     """
 
-    def in_prompt(self) -> StyleAndTextTuples:
+    def in_prompt(self) -> AnyFormattedText:
         return [("class:prompt", ">>> ")]
 
-    def in2_prompt(self, width: int) -> StyleAndTextTuples:
+    def in2_prompt(self, width: int) -> AnyFormattedText:
         return [("class:prompt.dots", "...")]
 
-    def out_prompt(self) -> StyleAndTextTuples:
+    def out_prompt(self) -> AnyFormattedText:
         return []
diff --git a/ptpython/python_input.py b/ptpython/python_input.py
@@ -205,7 +205,7 @@ def __init__(
         self.extra_key_bindings = extra_key_bindings or KeyBindings()
 
         # Settings.
-        self.title: AnyFormattedText = ''
+        self.title: AnyFormattedText = ""
         self.show_signature: bool = False
         self.show_docstring: bool = False
         self.show_meta_enter_message: bool = True
diff --git a/ptpython/repl.py b/ptpython/repl.py
@@ -21,7 +21,7 @@
     PygmentsTokens,
     merge_formatted_text,
 )
-from prompt_toolkit.formatted_text.utils import fragment_list_width
+from prompt_toolkit.formatted_text import fragment_list_width, to_formatted_text
 from prompt_toolkit.patch_stdout import patch_stdout as patch_stdout_context
 from prompt_toolkit.shortcuts import clear_title, print_formatted_text, set_title
 from prompt_toolkit.utils import DummyContext
@@ -152,7 +152,7 @@ def compile_with_flags(code: str, mode: str):
                 locals["_"] = locals["_%i" % self.current_statement_index] = result
 
                 if result is not None:
-                    out_prompt = self.get_output_prompt()
+                    out_prompt = to_formatted_text(self.get_output_prompt())
 
                     try:
                         result_str = "%r\n" % (result,)
