Use matplotlib.cbook.warn_deprecated

mdboom · mdboom · commit 0c4570242662 · 2013-12-11T10:10:23.000-05:00
diff --git a/lib/matplotlib/sphinxext/ipython_console_highlighting.py b/lib/matplotlib/sphinxext/ipython_console_highlighting.py
@@ -22,14 +22,13 @@
 from pygments.token import Comment, Generic
 
 from sphinx import highlighting
+import matplotlib
 
-import warnings
-warnings.warn("""
+matplotlib.cbook.warn_deprecated("1.4", """
 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)
+'IPython.sphinxext.ipython_directive.""")
 
 #-----------------------------------------------------------------------------
 # Global constants
diff --git a/lib/matplotlib/sphinxext/ipython_directive.py b/lib/matplotlib/sphinxext/ipython_directive.py
@@ -80,13 +80,11 @@
 
 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)
+matplotlib.cbook.warn_deprecated("1.4", """
+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.""")
 
 # Our own
 try:
