Suppress some more rc deprecation warnings.

anntzer · anntzer · commit 0e611f978db8 · 2018-06-20T01:07:17.000+02:00
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -1220,21 +1220,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:
