move ipython sphinx extensions into IPython.sphinxext

ipython · Jul 6, 2013 · 76fe30c · 76fe30c
1 parent b60405b
commit 76fe30c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/...sphinxext/ipython_console_highlighting.py → ...sphinxext/ipython_console_highlighting.py b/...sphinxext/ipython_console_highlighting.py → ...sphinxext/ipython_console_highlighting.py
diff --git a/docs/sphinxext/ipython_directive.py → IPython/sphinxext/ipython_directive.py b/docs/sphinxext/ipython_directive.py → IPython/sphinxext/ipython_directive.py
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -30,9 +30,9 @@
 # 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 @@
     '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 @@
     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']