Merge pull request #10868 from jorisvandenbossche/doc-ipython-sphinxe…

…xt-update DOC: update ipython sphinxext for IPython 4.0
pandas-dev · Aug 23, 2015 · c399b9e · c399b9e
2 parents a44e4b3 + 6ee9f53
commit c399b9e
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/doc/sphinxext/ipython_sphinxext/ipython_directive.py b/doc/sphinxext/ipython_sphinxext/ipython_directive.py
@@ -127,7 +127,11 @@
 from sphinx.util.compat import Directive
 
 # Our own
-from IPython import Config, InteractiveShell
+try:
+    from traitlets.config import Config
+except ImportError:
+    from IPython import Config
+from IPython import InteractiveShell
 from IPython.core.profiledir import ProfileDir
 from IPython.utils import io
 from IPython.utils.py3compat import PY3