Changeset 2621 for trunk/bin

Timestamp:

08/06/12 12:15:11 (12 years ago)

Author:

Malte Marquarding

Message:

allow for ipython >=0.10 (both 0.10 and 0.11)

File:

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

trunk/bin/asap

@@ -2 +2 @@
 import os
 
-def main():
+def main10():
+    from IPython.Shell import IPShellEmbed
+
+    banner = "HELLO"
+    exit_msg = "bye"
+    
+    ipshell = IPShellEmbed(sys.argv[1:],banner,exit_msg)
+    return ipshell
+
+
+def main11():
     from IPython.config.loader import Config
     cfg = Config()
@@ -19 +29 @@
                                     banner1 = welcome(),
                                     exit_msg = '')
-    ipshell()
+    return ipshell
 
 try: 
@@ -25 +35 @@
     import IPython
     from asap import *
-    main()
+    vers = int(IPython.__version__.split(".")[1])
+    if vers >= 11:
+        ipshell = main11()
+    else:
+        ipshell = main10()
+
 except ImportError:
-    print "No ipython found. Running standard python"
+    banner =  "No ipython found. Running standard python"
+    import code
     from asap import *
+    del main
+    code.interact(banner, local=locals())