Added support for IPython 5.0 in ptipython.

jonathanslenders · jonathanslenders · commit 32827385cca6 · 2016-06-13T20:35:22.000+02:00
diff --git a/ptpython/ipython.py b/ptpython/ipython.py
@@ -21,6 +21,7 @@
 
 from .python_input import PythonInput, PythonValidator, PythonCompleter
 from .eventloop import create_eventloop
+from .style import default_ui_style
 
 from IPython.terminal.embed import InteractiveShellEmbed as _InteractiveShellEmbed
 from IPython.terminal.ipapp import load_default_config
@@ -59,6 +60,23 @@ def out_tokens(self, cli):
         return [(Token.Out, text)]
 
 
+class IPython5Prompt(PromptStyle):
+    """
+    Style for IPython >5.0, use the prompt_toolkit tokens directly.
+    """
+    def __init__(self, prompts):
+        self.prompts = prompts
+
+    def in_tokens(self, cli):
+        return self.prompts.in_prompt_tokens(cli)
+
+    def in2_tokens(self, cli, width):
+        return self.prompts.continuation_prompt_tokens(cli)
+
+    def out_tokens(self, cli):
+        return []
+
+
 class IPythonValidator(PythonValidator):
     def __init__(self, *args, **kwargs):
         super(IPythonValidator, self).__init__(*args, **kwargs)
@@ -167,8 +185,31 @@ def __init__(self, ipython_shell, *a, **kw):
         super(IPythonInput, self).__init__(*a, **kw)
         self.ipython_shell = ipython_shell
 
-        self.all_prompt_styles['ipython'] = IPythonPrompt(ipython_shell.prompt_manager)
-        self.prompt_style = 'ipython'
+        # Prompt for IPython < 5.0
+        if hasattr(ipython_shell, 'prompt_manager'):
+            self.all_prompt_styles['ipython'] = IPythonPrompt(ipython_shell.prompt_manager)
+            self.prompt_style = 'ipython'
+
+        # Prompt for IPython >=5.0:
+        if hasattr(ipython_shell, 'prompts'):
+            self.all_prompt_styles['ipython'] = IPython5Prompt(ipython_shell.prompts)
+            self.prompt_style = 'ipython'
+
+
+        # UI style for IPython. Add tokens that are used by IPython>5.0
+        style_dict = {}
+        style_dict.update(default_ui_style)
+        style_dict.update({
+            Token.Prompt:        '#009900',
+            Token.PromptNum:     '#00ff00 bold',
+            Token.OutPrompt:     '#990000',
+            Token.OutPromptNum:  '#ff0000 bold',
+        })
+
+        self.ui_styles = {
+            'default': style_dict,
+        }
+        self.use_ui_colorscheme('default')
 
 
 class InteractiveShellEmbed(_InteractiveShellEmbed):
@@ -200,11 +241,16 @@ def get_globals():
 
         if configure:
             configure(ipython_input)
+            ipython_input.prompt_style = 'ipython'  # Don't take from config.
 
         self._cli = CommandLineInterface(
                 application=ipython_input.create_application(),
                 eventloop=self._eventloop)
 
+    def prompt_for_code(self):
+        # IPython 5.0 calls `prompt_for_code` instead of `raw_input`.
+        return self.raw_input(self)
+
     def raw_input(self, prompt=''):
         print('')
         try:
diff --git a/ptpython/style.py b/ptpython/style.py
@@ -78,7 +78,7 @@ def generate_style(python_style, ui_style):
         Token.Prompt:                                 'bold',
         Token.Prompt.Dots:                            'noinherit',
 
-        # (IPython) Prompt: "In [1]:"
+        # (IPython <5.0) Prompt: "In [1]:"
         Token.In:                                     'bold #008800',
         Token.In.Number:                              '',
 
