From 5889e66085588246ef03b06792aa2a482e25fa8d 2015-04-22 01:15:34
From: Thomas Kluyver <takowl@gmail.com>
Date: 2015-04-22 01:15:34
Subject: [PATCH] Fix imports in IPython directive

---

diff --git a/IPython/sphinxext/ipython_directive.py b/IPython/sphinxext/ipython_directive.py
index 3e8ca44..ef6fb59 100644
--- a/IPython/sphinxext/ipython_directive.py
+++ b/IPython/sphinxext/ipython_directive.py
@@ -148,7 +148,8 @@ from docutils import nodes
 from sphinx.util.compat import Directive
 
 # Our own
-from IPython import Config, InteractiveShell
+from traitlets.config import Config
+from IPython import InteractiveShell
 from IPython.core.profiledir import ProfileDir
 from IPython.utils import io
 from IPython.utils.py3compat import PY3