Merge pull request #3174 from tacaswell/qt_compat_deprec

WeatherGod · WeatherGod · commit f8963818fdc9 · 2014-07-06T17:44:24.000-04:00
MNT : replace and deprecated qt4_compat
diff --git a/doc/api/api_changes.rst b/doc/api/api_changes.rst
@@ -50,6 +50,11 @@ original location:
   - mstream -> `from matplotlib import stream as mstream`
   - mtable -> `from matplotlib import table as mtable`
 
+* As part of the refactoring to enable Qt5 support, the module
+  `matplotlib.backends.qt4_compat` was renamed to
+  `matplotlib.qt_compat`.  `qt4_compat` is deprecated in 1.4 and
+   will be removed in 1.5.
+
 * The :func:`~matplotlib.pyplot.errorbar` method has been changed such that
   the upper and lower limits (*lolims*, *uplims*, *xlolims*, *xuplims*) now
   point in the correct direction.
diff --git a/lib/matplotlib/backends/qt4_compat.py b/lib/matplotlib/backends/qt4_compat.py
@@ -0,0 +1,11 @@
+import warnings
+from matplotlib.cbook import mplDeprecation
+_warn_str = ("This module has been deprecated in 1.4 in favor "
+             "matplotlib.backends.qt_compat\n"
+             "This module will be removed in 1.5, please update "
+             "your imports.")
+# bulk-imports because we are pretending that file is this file
+from .qt_compat import *
+
+
+warnings.warn(_warn_str, mplDeprecation)
