Skip to content

Commit c399b9e

Browse files
Merge pull request pandas-dev#10868 from jorisvandenbossche/doc-ipython-sphinxext-update
DOC: update ipython sphinxext for IPython 4.0
2 parents a44e4b3 + 6ee9f53 commit c399b9e

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

doc/sphinxext/ipython_sphinxext/ipython_directive.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,11 @@
127127
from sphinx.util.compat import Directive
128128

129129
# Our own
130-
from IPython import Config, InteractiveShell
130+
try:
131+
from traitlets.config import Config
132+
except ImportError:
133+
from IPython import Config
134+
from IPython import InteractiveShell
131135
from IPython.core.profiledir import ProfileDir
132136
from IPython.utils import io
133137
from IPython.utils.py3compat import PY3

0 commit comments

Comments
 (0)