Merge pull request matplotlib#2656 from mdboom/use-ipython-console-highlighting-if-available

pelson · pelson · commit e4fc86f07754 · 2013-12-10T05:00:12.000-08:00
Use IPython's copy of ipython_console_highlighting Sphinx ext, if available
diff --git a/doc/conf.py b/doc/conf.py
@@ -30,10 +30,17 @@
               'sphinx.ext.doctest', 'sphinx.ext.autosummary',
               'matplotlib.sphinxext.plot_directive', 'sphinx.ext.inheritance_diagram',
               'sphinxext.gen_gallery', 'sphinxext.gen_rst',
-              'matplotlib.sphinxext.ipython_console_highlighting',
               'sphinxext.github',
               'numpydoc']
 
+# Use IPython's console highlighting by default
+try:
+    from IPython.sphinxext import ipython_console_highlighting
+except ImportError:
+    extensions.append('matplotlib.sphinxext.ipython_console_highlighting')
+else:
+    print("Using IPython's ipython_console_highlighting directive")
+    extensions.append('IPython.sphinxext.ipython_console_highlighting')
 
 try:
     import numpydoc
