Merge pull request #2053 from mdboom/ipython-directive-error-message

pelson · pelson · commit 22c39787a5e4 · 2013-05-24T09:28:35.000-07:00
sphinxext.ipython_directive import error.
diff --git a/lib/matplotlib/sphinxext/ipython_directive.py b/lib/matplotlib/sphinxext/ipython_directive.py
@@ -80,9 +80,15 @@
 matplotlib.use('Agg')
 
 # Our own
-from IPython import Config, InteractiveShell
-from IPython.core.profiledir import ProfileDir
-from IPython.utils import io
+try:
+    from IPython import Config, InteractiveShell
+    from IPython.core.profiledir import ProfileDir
+    from IPython.utils import io
+except ImportError:
+    raise ImportError(
+        "Unable to import the necessary objects from IPython. "
+        "You may need to install or upgrade your IPython installation.")
+
 
 #-----------------------------------------------------------------------------
 # Globals
