From 4a7a056c20d967edb574dd80feb092b239db184f 2012-06-26 19:50:52
From: MinRK <benjaminrk@gmail.com>
Date: 2012-06-26 19:50:52
Subject: [PATCH] move RemoteError import to top-level

Still inside function to prevent circular imports

A better fix is to fold parallel.error into core.error,
but I don't want to do that this close to 0.13 release.

should fix #1688

---

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 430da70..d758630 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -84,6 +84,22 @@ from IPython.utils.traitlets import (Integer, CBool, CaselessStrEnum, Enum,
 from IPython.utils.warn import warn, error
 import IPython.core.hooks
 
+# FIXME: do this in a function to avoid circular dependencies
+# A better solution is to remove IPython.parallel.error,
+# and place those classes in IPython.core.error.
+
+class RemoteError(Exception):
+    pass
+
+def _import_remote_error():
+    global RemoteError
+    try:
+        from IPython.parallel.error import RemoteError
+    except:
+        pass
+
+_import_remote_error()
+
 #-----------------------------------------------------------------------------
 # Globals
 #-----------------------------------------------------------------------------
@@ -1705,13 +1721,6 @@ class InteractiveShell(SingletonConfigurable):
                 self.write_err('No traceback available to show.\n')
                 return
             
-            # this import must be done *after* the above call,
-            # to avoid affecting the exc_info
-            try:
-                from IPython.parallel.error import RemoteError
-            except ImportError:
-                class RemoteError(Exception): pass
-
             if etype is SyntaxError:
                 # Though this won't be called by syntax errors in the input
                 # line, there may be SyntaxError cases with imported code.