Changeset 2929 for trunk

Timestamp:

04/17/14 11:34:45 (11 years ago)

Author:

Malte Marquarding

Message:

Make ipython >=1.x compatible

Location:

trunk

Files:

• bin/asap (modified) (4 diffs)
• python/__init__.py (modified) (1 diff)
• setup.py (modified) (1 diff)

trunk/bin/asap

@@ -2 +2 @@
 import os
 
-def _main10():
+def _main010():
     from IPython.Shell import IPShellEmbed
 
@@ -14 +14 @@
 
 
-def _main11():
+def _main011():
     from IPython.config.loader import Config
     cfg = Config()
@@ -26 +26 @@
     cfg.InteractiveShell.confirm_exit=False
     cfg.InteractiveShell.xmode='Plain'
-
-    from IPython.frontend.terminal.embed import InteractiveShellEmbed
+    try:        
+        from IPython.terminal.embed import InteractiveShellEmbed
+    except ImportError:
+        from IPython.frontend.terminal.embed import InteractiveShellEmbed
     ipshell = InteractiveShellEmbed(config=cfg,
                                     banner1 = welcome(),
@@ -36 +38 @@
     os.system('clear')
     import IPython
-    from asap import *
-    vers = int(IPython.__version__.split(".")[1])
-    if vers >= 11:
-        ipshell = _main11()
+    from asap import *    
+    vitems = IPython.__version__.split(".")
+    vmaj = int(vitems[0])
+    vmin = int(vitems[1])
+    if vmaj == 0:
+        if vmin >= 11:
+            ipshell = _main011()
+        else:
+            ipshell = _main010()
     else:
-        ipshell = _main10()
+        ipshell = _main011()
     ipshell()
 

trunk/python/__init__.py

@@ -60 +60 @@
 
 __date__ = '$Date$'.split()[1]
-__version__  = '4.2.0a'
+__version__  = '4.3.0a'
 __revision__ = get_revision()
 

trunk/setup.py

@@ -4 +4 @@
 
 setup(name = PKGNAME,
-      version = '4.2.0a',
+      version = '4.3.0a',
       description = 'ATNF Spectral-line Analysis Package',
       author = 'Malte Marquarding',