Changeset 1563

Timestamp:

Nov 5, 2014 4:02:44 PM (8 years ago)

Author:

toby

Message:

manage with IPython 0.12 from EPD

File:

• trunk/GSASIIpath.py (modified) (2 diffs)

trunk/GSASIIpath.py

@@ -314 +314 @@
     '''
     savehook = sys.excepthook # save the exception hook
-    from IPython.terminal.embed import InteractiveShellEmbed
+    try: 
+        from IPython.terminal.embed import InteractiveShellEmbed
+    except ImportError:
+        try:
+            # try the IPython 0.12 approach
+            from IPython.frontend.terminal.embed import InteractiveShellEmbed
+        except ImportError:
+            print 'IPython InteractiveShellEmbed not found'
+            return
     import inspect
     ipshell = InteractiveShellEmbed()
@@ -332 +340 @@
     from IPython.core import ultratb
     ultratb.FormattedTB(call_pdb=False,color_scheme='LightBG')(*args)
-    from IPython.terminal.embed import InteractiveShellEmbed
+    try: 
+        from IPython.terminal.embed import InteractiveShellEmbed
+    except ImportError:
+        try:
+            # try the IPython 0.12 approach
+            from IPython.frontend.terminal.embed import InteractiveShellEmbed
+        except ImportError:
+            print 'IPython InteractiveShellEmbed not found'
+            return
     import inspect
     frame = inspect.getinnerframes(args[2])[-1][0]
     msg   = 'Entering IPython console at {0.f_code.co_filename} at line {0.f_lineno}'.format(frame)
+    savehook = sys.excepthook # save the exception hook
     InteractiveShellEmbed(banner1=msg)(local_ns=frame.f_locals,global_ns=frame.f_globals)
+    sys.excepthook = savehook # reset IPython's change to the exception hook
 
 def DoNothing():