From 6ee9f537199a6205330a1e0955823b820582515d Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Thu, 20 Aug 2015 22:55:20 +0200 Subject: [PATCH] DOC: update ipython sphinxext for IPython 4.0 --- doc/sphinxext/ipython_sphinxext/ipython_directive.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/sphinxext/ipython_sphinxext/ipython_directive.py b/doc/sphinxext/ipython_sphinxext/ipython_directive.py index 3f9be95609874..ad7ada8e4eea3 100644 --- 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