Return views for .keys(), .values(), .items()

chahak13 · chahak13 · commit 8bce1e4730bc · 2023-05-09T18:58:32.000-05:00
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -135,7 +135,7 @@
 
 import atexit
 from collections import namedtuple, ChainMap
-from collections.abc import MutableMapping, Mapping
+from collections.abc import MutableMapping, Mapping, KeysView, ValuesView, ItemsView
 import contextlib
 import functools
 import importlib
@@ -845,8 +845,13 @@ def __contains__(self, key):
 
     def __iter__(self):
         """Yield from sorted list of keys"""
+        keys = (
+            ".".join((space, key))
+            for space, mapping in self._namespace_maps.items()
+            for key in mapping.keys()
+        )
         with _api.suppress_matplotlib_deprecation_warning():
-            yield from sorted(self.keys())
+            yield from sorted(keys)
 
     def __len__(self):
         return sum(len(mapping) for mapping in self._namespace_maps)
@@ -863,22 +868,6 @@ def __repr__(self):
     def __str__(self):
         return '\n'.join(map('{0[0]}: {0[1]}'.format, sorted(self.items())))
 
-    def keys(self):
-        keys = (
-            ".".join((space, key))
-            for space, mapping in self._namespace_maps.items()
-            for key in mapping.keys()
-        )
-        return keys
-
-    def values(self):
-        for key in self.keys():
-            yield self[key]
-
-    def items(self):
-        for key, value in zip(self.keys(), self.values()):
-            yield key, value
-
     def pop(self, key):
         keys, depth = self._split_key(key)
         if depth == 1:
diff --git a/lib/matplotlib/__init__.pyi b/lib/matplotlib/__init__.pyi
@@ -75,16 +75,14 @@ class RcParams(MutableMapping):
     namespaces: tuple
     single_key_set: set
     def __init__(self, *args, **kwargs) -> None: ...
-    def _split_key(self, key: str, sep: str = ".") -> tuple[list, int]: ...
+    def _split_key(key: str, sep: str = ...) -> tuple[list, int]: ...
     def _set(self, key: str, val: Any) -> None: ...
     def _get(self, key: str) -> Any: ...
     def __setitem__(self, key: str, val: Any) -> None: ...
     def __getitem__(self, key: str) -> Any: ...
     def __delitem__(self, key: str) -> None: ...
     def __iter__(self) -> Generator[str, None, None]: ...
     def __len__(self) -> int: ...
-    def keys(self) -> Generator[str, None, None]: ...
-    def values(self) -> Generator[Any, None, None]: ...
     def find_all(self, pattern: str) -> RcParams: ...
     def copy(self) -> RcParams: ...
 
