Changeset 3130 for trunk

Timestamp:

05/16/17 23:13:37 (8 years ago)

Author:

Malte Marquarding

Message:

Make Ipython >= 5 compatible

File:

• trunk/bin/asap (modified) (2 diffs)

trunk/bin/asap

@@ -2 +2 @@
 import os
 
-def _main010():
-    from IPython.Shell import IPShellEmbed
+def _main500():
+    from IPython.terminal.prompts import Prompts, Token
+    from traitlets.config.loader import Config
 
-    banner = welcome()
-    exit_msg = ''
-    args = ['-colors','Linux','-noconfirm_exit', '-readline', 
-            '-xmode', 'Plain', '-autocall', '2', '-autoindent',
-            '-pi1', 'ASAP> ', '-po', 'asap>: ', '-pprint']
-    ipshell = IPShellEmbed(args,banner,exit_msg)
+    class MyPrompt(Prompts):
+        def in_prompt_tokens(self, cli=None):
+            return [(Token.Prompt, 'ASAP> ')]
+
+        def out_prompt_tokens(self, cli=None):
+            return [(Token.OutPrompt, 'asap>: ')]
+
+    cfg = Config()
+    cfg.TerminalInteractiveShell.colors = "Linux"
+    cfg.TerminalInteractiveShell.prompts_class=MyPrompt
+    from IPython.terminal.embed import InteractiveShellEmbed
+    ipshell = InteractiveShellEmbed(config=cfg,
+                                    banner1 = welcome(),
+                                    exit_msg = '')
     return ipshell
-
-
+    
 def _main011():
     from IPython.config.loader import Config
@@ -41 +49 @@
     vitems = IPython.__version__.split(".")
     vmaj = int(vitems[0])
-    vmin = int(vitems[1])
-    if vmaj == 0:
-        if vmin >= 11:
-            ipshell = _main011()
-        else:
-            ipshell = _main010()
+    if vmaj >= 5:
+        ipshell = _main500()
     else:
         ipshell = _main011()
     ipshell()
-
+    
 except ImportError:
     banner =  "No ipython found. Running standard python"