Remove default. usage outside the RcParams class

chahak13 · chahak13 · commit b5456db0940a · 2023-05-09T18:58:32.000-05:00
This is to make the interface such that the code other than RcParams
doesn't have to deal with the `deafult.*` namespace anywhere. This also
changes the keys returned by `.keys()` to not have the `default.*` in
the key name.
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -776,12 +776,12 @@ def __setitem__(self, key, val):
                 return
             elif key == 'backend' or key == "default.backend":
                 if val is rcsetup._auto_backend_sentinel:
-                    if 'backend' in self:
+                    if 'backend' in self or 'default.backend' in self:
                         return
-            if key in self.single_key_set:
-                key = f"default.{key}"
             try:
                 cval = self.validate[key](val)
+                if key in self.single_key_set:
+                    key = f"default.{key}"
             except ValueError as ve:
                 raise ValueError(f"Key {key}: {ve}") from None
             self._set(key, cval)
@@ -846,7 +846,7 @@ def __contains__(self, key):
     def __iter__(self):
         """Yield from sorted list of keys"""
         keys = (
-            ".".join((space, key))
+            ".".join((space, key)) if space != 'default' else key
             for space, mapping in self._namespace_maps.items()
             for key in mapping.keys()
         )
@@ -1018,8 +1018,6 @@ def _rc_params_in_file(fname, transform=lambda x: x, fail_on_error=False):
     config = RcParams()
 
     for key, (val, line, line_no) in rc_temp.items():
-        if key in config.single_key_set:
-            key = f"default.{key}"
         if key in rcsetup._validators:
             if fail_on_error:
                 config[key] = val  # try to convert to proper type or raise
@@ -1096,23 +1094,22 @@ def rc_params_from_file(fname, fail_on_error=False, use_default_template=True):
 # in that case.  However, packagers can set a different default backend
 # (resulting in a normal `#backend: foo` line) in which case we should *not*
 # fill in _auto_backend_sentinel.
-rcParamsDefault.setdefault("default.backend", rcsetup._auto_backend_sentinel)
-params_dict = RcParams()
-params_dict.update(rcParamsDefault.items())
-params_dict.update(_rc_params_in_file(matplotlib_fname()))
-rcParamsOrig = params_dict.copy()
+rcParamsDefault.setdefault("backend", rcsetup._auto_backend_sentinel)
+rcParams = RcParams()
+rcParams.update(rcParamsDefault.items())
+rcParams.update(_rc_params_in_file(matplotlib_fname()))
+rcParamsOrig = rcParams.copy()
 with _api.suppress_matplotlib_deprecation_warning():
     # This also checks that all rcParams are indeed listed in the template.
     # Assigning to rcsetup.defaultParams is left only for backcompat.
     defaultParams = rcsetup.defaultParams = {
         # We want to resolve deprecated rcParams, but not backend...
-        key: [(rcsetup._auto_backend_sentinel if key == "default.backend" else
+        key: [(rcsetup._auto_backend_sentinel if key == "backend" else
                rcParamsDefault[key]),
               validator]
         for key, validator in rcsetup._validators.items()}
-if params_dict['axes.formatter.use_locale']:
+if rcParams['axes.formatter.use_locale']:
     locale.setlocale(locale.LC_ALL, '')
-rcParams = RcParams(params_dict)
 
 
 def rc(group, **kwargs):
@@ -1388,14 +1385,14 @@ def use(backend, *, force=True):
         # value which will be respected when the user finally imports
         # pyplot
         else:
-            rcParams['default.backend'] = backend
+            rcParams['backend'] = backend
     # if the user has asked for a given backend, do not helpfully
     # fallback
-    rcParams['default.backend_fallback'] = False
+    rcParams['backend_fallback'] = False
 
 
 if os.environ.get('MPLBACKEND'):
-    rcParams['default.backend'] = os.environ.get('MPLBACKEND')
+    rcParams['backend'] = os.environ.get('MPLBACKEND')
 
 
 def get_backend():
@@ -1413,7 +1410,7 @@ def interactive(b):
     """
     Set whether to redraw after every plotting command (e.g. `.pyplot.xlabel`).
     """
-    rcParams['default.interactive'] = b
+    rcParams['interactive'] = b
 
 
 def is_interactive():
@@ -1425,7 +1422,7 @@ def is_interactive():
         This function is only intended for use in backends. End users should
         use `.pyplot.isinteractive` instead.
     """
-    return rcParams['default.interactive']
+    return rcParams['interactive']
 
 
 def _init_tests():
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -302,16 +302,16 @@ def switch_backend(newbackend):
             except ImportError:
                 continue
             else:
-                rcParamsOrig['default.backend'] = candidate
+                rcParamsOrig['backend'] = candidate
                 return
         else:
             # Switching to Agg should always succeed; if it doesn't, let the
             # exception propagate out.
             switch_backend("agg")
-            rcParamsOrig["default.backend"] = "agg"
+            rcParamsOrig["backend"] = "agg"
             return
     # have to escape the switch on access logic
-    old_backend = rcParams['default.backend']
+    old_backend = rcParams._get('backend')
 
     backend_mod = importlib.import_module(
         cbook._backend_module_name(newbackend))
@@ -384,7 +384,7 @@ def draw_if_interactive():
     _log.debug("Loaded backend %s version %s.",
                newbackend, backend_mod.backend_version)
 
-    rcParams['default.backend'] = rcParamsDefault['default.backend'] = newbackend
+    rcParams['backend'] = rcParamsDefault['backend'] = newbackend
     _backend_mod = backend_mod
     for func_name in ["new_figure_manager", "draw_if_interactive", "show"]:
         globals()[func_name].__signature__ = inspect.signature(
@@ -2379,11 +2379,11 @@ def polar(*args, **kwargs) -> list[Line2D]:
 # If rcParams['backend_fallback'] is true, and an interactive backend is
 # requested, ignore rcParams['backend'] and force selection of a backend that
 # is compatible with the current running interactive framework.
-if (rcParams["default.backend_fallback"]
+if (rcParams["backend_fallback"]
         and rcParams._get_backend_or_none() in (  # type: ignore
             set(_interactive_bk) - {'WebAgg', 'nbAgg'})
         and cbook._get_running_interactive_framework()):  # type: ignore
-    rcParams._set("default.backend", rcsetup._auto_backend_sentinel)  # type: ignore
+    rcParams._set("backend", rcsetup._auto_backend_sentinel)  # type: ignore
 
 # fmt: on
 
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -811,12 +811,12 @@ def _convert_validator_spec(key, conv):
 # The rcParams defaults are defined in lib/matplotlib/mpl-data/matplotlibrc, which
 # gets copied to matplotlib/mpl-data/matplotlibrc by the setup script.
 _validators = {
-    "default.backend":           validate_backend,
-    "default.backend_fallback":  validate_bool,
+    "backend":           validate_backend,
+    "backend_fallback":  validate_bool,
     "figure.hooks":      validate_stringlist,
-    "default.toolbar":           _validate_toolbar,
-    "default.interactive":       validate_bool,
-    "default.timezone":          validate_string,
+    "toolbar":           _validate_toolbar,
+    "interactive":       validate_bool,
+    "timezone":          validate_string,
 
     "webagg.port":            validate_int,
     "webagg.address":         validate_string,
diff --git a/lib/matplotlib/style/core.py b/lib/matplotlib/style/core.py
@@ -39,9 +39,9 @@
 STYLE_EXTENSION = 'mplstyle'
 # A list of rcParams that should not be applied from styles
 STYLE_BLACKLIST = {
-    'default.interactive', 'default.backend', 'webagg.port', 'webagg.address',
-    'webagg.port_retries', 'webagg.open_in_browser', 'default.backend_fallback',
-    'default.toolbar', 'default.timezone', 'figure.max_open_warning',
+    'interactive', 'backend', 'webagg.port', 'webagg.address',
+    'webagg.port_retries', 'webagg.open_in_browser', 'backend_fallback',
+    'toolbar', 'timezone', 'figure.max_open_warning',
     'figure.raise_window', 'savefig.directory', 'tk.window_focus',
     'docstring.hardcopy', 'date.epoch'}
 
diff --git a/lib/matplotlib/tests/test_rcparams.py b/lib/matplotlib/tests/test_rcparams.py
@@ -192,7 +192,7 @@ def test_axes_titlecolor_rcparams():
 
 def test_Issue_1713(tmpdir):
     rcpath = Path(tmpdir) / 'test_rcparams.rc'
-    rcpath.write_text('default.timezone: UTC', encoding='utf-8')
+    rcpath.write_text('timezone: UTC', encoding='utf-8')
     with mock.patch('locale.getpreferredencoding', return_value='UTF-32-BE'):
         rc = mpl.rc_params_from_file(rcpath, True, False)
     assert rc.get('timezone') == 'UTC'
diff --git a/lib/matplotlib/tests/test_widgets.py b/lib/matplotlib/tests/test_widgets.py
@@ -1011,7 +1011,7 @@ def test_CheckButtons(ax):
 @pytest.mark.parametrize("toolbar", ["none", "toolbar2", "toolmanager"])
 def test_TextBox(ax, toolbar):
     # Avoid "toolmanager is provisional" warning.
-    plt.rcParams._set("default.toolbar", toolbar)
+    plt.rcParams._set("toolbar", toolbar)
 
     submit_event = mock.Mock(spec=noop, return_value=None)
     text_change_event = mock.Mock(spec=noop, return_value=None)
