Add rcParams._getitem_skip_deprecation.

anntzer · anntzer · commit 7350d8be5f1f · 2020-01-09T17:34:45.000+01:00
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -648,14 +648,17 @@ def __setitem__(self, key, val):
                 f"a list of valid parameters)")
 
     def __getitem__(self, key):
+        if key in _deprecated_rcs:
+            cbook.warn_deprecated(
+                **{"name": key, "obj_type": "rcparam", **_deprecated_rcs[key]})
+        return self._getitem_skip_deprecation(key)
+
+    def _getitem_skip_deprecation(self, key):
         if key == "backend":
             val = dict.__getitem__(self, key)
             if val is rcsetup._auto_backend_sentinel:
                 from matplotlib import pyplot as plt
                 plt.switch_backend(rcsetup._auto_backend_sentinel)
-        if key in _deprecated_rcs:
-            cbook.warn_deprecated(
-                **{"name": key, "obj_type": "rcparam", **_deprecated_rcs[key]})
         return dict.__getitem__(self, key)
 
     def __repr__(self):
diff --git a/lib/matplotlib/texmanager.py b/lib/matplotlib/texmanager.py
@@ -160,15 +160,17 @@ def get_font_config(self):
         if self._rc_cache is None:
             self._rc_cache = dict.fromkeys(self._rc_cache_keys)
         changed = [par for par in self._rc_cache_keys
-                   if dict.__getitem__(rcParams, par) != self._rc_cache[par]]
+                   if (rcParams._getitem_skip_deprecation(par)
+                       != self._rc_cache[par])]
         if changed:
             _log.debug('following keys changed: %s', changed)
             for k in changed:
                 _log.debug('%-20s: %-10s -> %-10s',
-                           k, self._rc_cache[k], dict.__getitem__(rcParams, k))
+                           k, self._rc_cache[k],
+                           rcParams._getitem_skip_deprecation(k))
                 # deepcopy may not be necessary, but feels more future-proof
                 self._rc_cache[k] = copy.deepcopy(
-                    dict.__getitem__(rcParams, k))
+                    rcParams._getitem_skip_deprecation(k))
             _log.debug('RE-INIT\nold fontconfig: %s', self._fontconfig)
             self._reinit()
         _log.debug('fontconfig: %s', self._fontconfig)
