Deprecate IPython-related Sphinx extensions

matplotlib · pelson · Dec 12, 2013 · Dec 10, 2013 · Dec 11, 2013 · Dec 11, 2013
commit fdf97c14d517e2d3f38068732427145e9339204b
diff --git a/lib/matplotlib/sphinxext/ipython_console_highlighting.py b/lib/matplotlib/sphinxext/ipython_console_highlighting.py
@@ -23,6 +23,14 @@
 
 from sphinx import highlighting
 
+import warnings
+warnings.warn("""
+The Sphinx extension ipython_console_highlighting has moved from
+matplotlib to IPython, and its use in matplotlib is deprecated.
+Change your import from 'matplotlib.sphinxext.ipython_directive' to
+'IPython.sphinxext.ipython_directive.""",
+matplotlib.cbook.mplDeprecation)
+
 #-----------------------------------------------------------------------------
 # Global constants
 line_re = re.compile('.*?\n')

diff --git a/lib/matplotlib/sphinxext/ipython_directive.py b/lib/matplotlib/sphinxext/ipython_directive.py
@@ -80,6 +80,14 @@
 
 matplotlib.use('Agg')
 
+import warnings
+warnings.warn("""
+The Sphinx ipython_directive has moved from matplotlib to IPython, and
+its use within matplotlib is deprecated.  Change your import from
+'matplotlib.sphinxext.ipython_directive' to
+'IPython.sphinxext.ipython_directive.""",
+matplotlib.cbook.mplDeprecation)
+
 # Our own
 try:
     from IPython import Config, InteractiveShell