Merge pull request #12663 from meeseeksmachine/auto-backport-of-pr-12658-on-v3.0.x

jklymak · web-flow · commit af9a17b331db · 2018-10-29T12:49:48.000-07:00
Backport PR #12658 on branch v3.0.x (Do not warn-depreacted when iterating over rcParams)
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -906,7 +906,9 @@ def __str__(self):
 
     def __iter__(self):
         """Yield sorted list of keys."""
-        yield from sorted(dict.__iter__(self))
+        with warnings.catch_warnings():
+            warnings.simplefilter('ignore', MatplotlibDeprecationWarning)
+            yield from sorted(dict.__iter__(self))
 
     def __len__(self):
         return dict.__len__(self)
@@ -928,8 +930,7 @@ def find_all(self, pattern):
                         if pattern_re.search(key))
 
     def copy(self):
-        return {k: dict.__getitem__(self, k)
-                for k in self}
+        return {k: dict.__getitem__(self, k) for k in self}
 
 
 def rc_params(fail_on_error=False):
