Suppress some more rc deprecation warnings.

anntzer · anntzer · commit 9a147a45287e · 2018-07-08T23:32:50.000+02:00
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -820,7 +820,7 @@ def gen_candidates():
     'axes.hold': ('2.1',),
     'backend.qt4': ('2.2',),
     'backend.qt5': ('2.2',),
-    'text.latex.unicde': ('3.0',),
+    'text.latex.unicode': ('3.0',),
 }
 
 
@@ -883,7 +883,7 @@ def __setitem__(self, key, val):
                 val = alt_val(val)
             elif key in _deprecated_remain_as_none and val is not None:
                 version, = _deprecated_remain_as_none[key]
-                addendum = None
+                addendum = ''
                 if key.startswith('backend'):
                     addendum = (
                         "In order to force the use of a specific Qt binding, "
@@ -1243,21 +1243,33 @@ def rcdefaults():
         Use a specific style file.  Call ``style.use('default')`` to restore
         the default style.
     """
-    rcParams.clear()
-    rcParams.update(rcParamsDefault)
+    # Deprecation warnings were already handled when creating rcParamsDefault,
+    # no need to reemit them here.
+    with warnings.catch_warnings():
+        warnings.simplefilter("ignore", mplDeprecation)
+        rcParams.clear()
+        rcParams.update(rcParamsDefault)
 
 
 def rc_file_defaults():
     """Restore the rc params from the original rc file loaded by Matplotlib.
     """
-    rcParams.update(rcParamsOrig)
+    # Deprecation warnings were already handled when creating rcParamsOrig, no
+    # need to reemit them here.
+    with warnings.catch_warnings():
+        warnings.simplefilter("ignore", mplDeprecation)
+        rcParams.update(rcParamsOrig)
 
 
 def rc_file(fname):
     """
     Update rc params from file.
     """
-    rcParams.update(rc_params_from_file(fname))
+    # Deprecation warnings were already handled in rc_params_from_file, no need
+    # to reemit them here.
+    with warnings.catch_warnings():
+        warnings.simplefilter("ignore", mplDeprecation)
+        rcParams.update(rc_params_from_file(fname))
 
 
 class rc_context:
diff --git a/lib/matplotlib/style/core.py b/lib/matplotlib/style/core.py
@@ -18,6 +18,7 @@
 
 import matplotlib as mpl
 from matplotlib import rc_params_from_file, rcParamsDefault
+from matplotlib.cbook import MatplotlibDeprecationWarning
 
 
 __all__ = ['use', 'context', 'available', 'library', 'reload_library']
@@ -98,7 +99,11 @@ def use(style):
         if not isinstance(style, str):
             _apply_style(style)
         elif style == 'default':
-            _apply_style(rcParamsDefault, warn=False)
+            # Deprecation warnings were already handled when creating
+            # rcParamsDefault, no need to reemit them here.
+            with warnings.catch_warnings():
+                warnings.simplefilter("ignore", MatplotlibDeprecationWarning)
+                _apply_style(rcParamsDefault, warn=False)
         elif style in library:
             _apply_style(library[style])
         else:
