Make namespaces private and correct setdefault

chahak13 · chahak13 · commit 68a16c9e9f0d · 2023-05-11T22:25:24.000-05:00
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -662,19 +662,19 @@ class RcParams(MutableMapping):
     :ref:`customizing-with-matplotlibrc-files`
     """
     validate = rcsetup._validators
-    namespaces = ("backends", "lines", "patches", "hatches", "boxplot", "font", "text",
-                  "latex", "axes", "date", "xtick", "ytick", "grid", "legend",
-                  "figure", "image", "contour", "errorbar", "hist", "scatter", "agg",
-                  "path", "savefig", "tk", "ps", "pdf", "svg", "pgf", "docstring",
-                  "keymap", "animation", "_internal", "webagg", "markers", "pcolor",
-                  "pcolormesh", "patch", "hatch", "mathtext", "polaraxes", "axes3d",
-                  "xaxis", "yaxis", "default")
+    _namespaces = ("backends", "lines", "patches", "hatches", "boxplot", "font", "text",
+                   "latex", "axes", "date", "xtick", "ytick", "grid", "legend",
+                   "figure", "image", "contour", "errorbar", "hist", "scatter", "agg",
+                   "path", "savefig", "tk", "ps", "pdf", "svg", "pgf", "docstring",
+                   "keymap", "animation", "_internal", "webagg", "markers", "pcolor",
+                   "pcolormesh", "patch", "hatch", "mathtext", "polaraxes", "axes3d",
+                   "xaxis", "yaxis", "default")
 
-    single_key_set = {"backend", "toolbar", "interactive",
-                      "timezone", "backend_fallback"}
+    _single_key_set = {"backend", "toolbar", "interactive",
+                       "timezone", "backend_fallback"}
 
     def __init__(self, *args, **kwargs):
-        self._namespace_maps = {name: ChainMap({}) for name in self.namespaces}
+        self._namespace_maps = {name: ChainMap({}) for name in self._namespaces}
         self.update(*args, **kwargs)
         self._new_child()
 
@@ -712,7 +712,7 @@ def _set(self, key, val):
         """
         keys, depth = self._split_key(key)
         if depth == 1:
-            if key in self.single_key_set:
+            if key in self._single_key_set:
                 self._namespace_maps["default"][key] = val
             # Uncomment the following line and remove the raise statement
             # to enable setting namespaces.
@@ -751,7 +751,7 @@ def _get(self, key):
         """
         keys, depth = self._split_key(key)
         if depth == 1:
-            if key in self.single_key_set:
+            if key in self._single_key_set:
                 return self._namespace_maps["default"].get(key)
             # Uncomment the following line and remove the raise statement
             # to enable getting namespace parameters.
@@ -785,7 +785,7 @@ def __setitem__(self, key, val):
                         return
             try:
                 cval = self.validate[key](val)
-                if key in self.single_key_set:
+                if key in self._single_key_set:
                     key = f"default.{key}"
             except ValueError as ve:
                 raise ValueError(f"Key {key}: {ve}") from None
@@ -821,7 +821,7 @@ def __getitem__(self, key):
     def _get_default(self, key):
         keys, depth = self._split_key(key)
         if depth == 1:
-            if key in self.single_key_set:
+            if key in self._single_key_set:
                 return self._namespace_maps["default"].get(key)
             # Uncomment the following line and remove the raise statement
             # to enable getting namespace parameters.
@@ -863,7 +863,7 @@ def __delitem__(self, key):
         keys, depth = self._split_key(key)
         try:
             if depth == 1:
-                if key in self.single_key_set:
+                if key in self._single_key_set:
                     del self._namespace_maps["default"][key]
                 else:
                     raise KeyError
@@ -877,7 +877,7 @@ def __delitem__(self, key):
     def __contains__(self, key):
         keys, depth = self._split_key(key)
         if depth == 1:
-            if key in self.single_key_set:
+            if key in self._single_key_set:
                 return key in self._namespace_maps["default"]
             else:
                 return False
@@ -912,7 +912,7 @@ def __str__(self):
     def pop(self, key):
         keys, depth = self._split_key(key)
         if depth == 1:
-            if key in self.single_key_set:
+            if key in self._single_key_set:
                 return self._namespace_mapping["default"][key]
             else:
                 raise KeyError(
@@ -930,6 +930,12 @@ def clear(self):
             self._namespace_maps[namespace].clear()
 
     def setdefault(self, key, default=None):
+        """Insert key with a value of default if key is not in the dictionary.
+
+        Return the value for key if key is in the dictionary, else default.
+        """
+        if key in self:
+            return self[key]
         self[key] = default
         return default
 
diff --git a/lib/matplotlib/style/core.py b/lib/matplotlib/style/core.py
@@ -149,7 +149,6 @@ def use(style):
             else:
                 filtered[k] = style[k]
         mpl.rcParams.update(filtered)
-    mpl.rcParams._new_child()
 
 
 @contextlib.contextmanager
