From 76fe30cfe4dec549d043ed617e609092142a6d1b 2013-07-06 04:23:07
From: MinRK <benjaminrk@gmail.com>
Date: 2013-07-06 04:23:07
Subject: [PATCH] move ipython sphinx extensions into IPython.sphinxext

---

diff --git a/docs/sphinxext/ipython_console_highlighting.py b/IPython/sphinxext/ipython_console_highlighting.py
similarity index 100%
rename from docs/sphinxext/ipython_console_highlighting.py
rename to IPython/sphinxext/ipython_console_highlighting.py
diff --git a/docs/sphinxext/ipython_directive.py b/IPython/sphinxext/ipython_directive.py
similarity index 100%
rename from docs/sphinxext/ipython_directive.py
rename to IPython/sphinxext/ipython_directive.py
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 61104f6..85a78c7 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -30,9 +30,9 @@ if ON_RTD:
 # absolute, like shown here.
 sys.path.insert(0, os.path.abspath('../sphinxext'))
 
-# Import support for ipython console session syntax highlighting (lives
-# in the sphinxext directory defined above)
-import ipython_console_highlighting
+# Import support for ipython console session syntax highlighting
+# (lives IPython's sphinxext subpackage)
+from IPython.sphinxext import ipython_console_highlighting
 
 # We load the ipython release info into a dict by explicit execution
 iprelease = {}
@@ -50,8 +50,8 @@ extensions = [
     'sphinx.ext.autodoc',
     'sphinx.ext.doctest',
     'sphinx.ext.inheritance_diagram',
-    'ipython_console_highlighting',
-    'ipython_directive',
+    'IPython.sphinxext.ipython_console_highlighting',
+    'IPython.sphinxext.ipython_directive',
     'numpydoc',  # to preprocess docstrings
     'github',  # for easy GitHub links
 ]
@@ -61,7 +61,7 @@ if ON_RTD:
     extensions.remove('matplotlib.sphinxext.only_directives')
     extensions.remove('matplotlib.sphinxext.mathmpl')
     extensions.remove('matplotlib.sphinxext.plot_directive')
-    extensions.remove('ipython_directive')
+    extensions.remove('IPython.sphinxext.ipython_directive')
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']