Merge pull request #20881 from anntzer/qt_compat

tacaswell · web-flow · commit e73202892850 · 2021-08-23T21:56:44.000-04:00
Deprecate some old globals in qt_compat.
diff --git a/doc/api/next_api_changes/deprecations/20881-AL.rst b/doc/api/next_api_changes/deprecations/20881-AL.rst
@@ -0,0 +1,3 @@
+``matplotlib.backends.qt_compat.ETS`` and ``matplotlib.backends.qt_compat.QT_RC_MAJOR_VERSION``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+... are deprecated, with no replacement.
diff --git a/lib/matplotlib/backends/qt_compat.py b/lib/matplotlib/backends/qt_compat.py
@@ -23,6 +23,7 @@
 from packaging.version import parse as parse_version
 
 import matplotlib as mpl
+from matplotlib import _api
 
 
 QT_API_PYQT6 = "PyQt6"
@@ -138,11 +139,6 @@ def _isdeleted(obj):
         "QT_MAC_WANTS_LAYER" not in os.environ):
     os.environ["QT_MAC_WANTS_LAYER"] = "1"
 
-# These globals are only defined for backcompatibility purposes.
-ETS = dict(pyqt5=(QT_API_PYQT5, 5), pyside2=(QT_API_PYSIDE2, 5))
-
-QT_RC_MAJOR_VERSION = int(QtCore.qVersion().split(".")[0])
-
 
 # PyQt6 enum compat helpers.
 
@@ -253,3 +249,11 @@ def handle(*args):
             signal.signal(signal.SIGINT, old_sigint_handler)
             if handler_args is not None:
                 old_sigint_handler(*handler_args)
+
+
+@_api.caching_module_getattr
+class __getattr__:
+    ETS = _api.deprecated("3.5")(property(lambda self: dict(
+        pyqt5=(QT_API_PYQT5, 5), pyside2=(QT_API_PYSIDE2, 5))))
+    QT_RC_MAJOR_VERSION = _api.deprecated("3.5")(property(
+        lambda self: int(QtCore.qVersion().split(".")[0])))

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+``matplotlib.backends.qt_compat.ETS`` and ``matplotlib.backends.qt_compat.QT_RC_MAJOR_VERSION``
	`2`	`+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`
	`3`	`+... are deprecated, with no replacement.`