remove usage of rc_default

eendebakpt · eendebakpt · commit aa740f39e5c6 · 2025-04-18T16:29:16.000+02:00
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -989,7 +989,7 @@ def clear(self, keep_observers=False):
         self.texts = []
         self.images = []
         self.legends = []
-        self.subplotpars.update(rc_default=True)
+        self.subplotpars.reset()
         if not keep_observers:
             self._axobservers = cbook.CallbackRegistry()
         self._suptitle = None
@@ -1312,7 +1312,7 @@ def colorbar(
         return cb
 
     def subplots_adjust(self, left=None, bottom=None, right=None, top=None,
-                        wspace=None, hspace=None, rc_default=False):
+                        wspace=None, hspace=None):
         """
         Adjust the subplot layout parameters.
 
@@ -1341,10 +1341,6 @@ def subplots_adjust(self, left=None, bottom=None, right=None, top=None,
         hspace : float, optional
             The height of the padding between subplots,
             as a fraction of the average Axes height.
-        rc_default : bool
-            Determine the defaults. *False*, the default, and the values
-            are unchanged. *True* and the values are taken from
-            :rc:`figure.subplot.*`
         """
         if (self.get_layout_engine() is not None and
                 not self.get_layout_engine().adjust_compatible):
@@ -1353,8 +1349,7 @@ def subplots_adjust(self, left=None, bottom=None, right=None, top=None,
                 "incompatible with subplots_adjust and/or tight_layout; "
                 "not calling subplots_adjust.")
             return
-        self.subplotpars.update(left, bottom, right, top, wspace, hspace,
-                                rc_default=rc_default)
+        self.subplotpars.update(left, bottom, right, top, wspace, hspace)
         for ax in self.axes:
             if ax.get_subplotspec() is not None:
                 ax._set_position(ax.get_subplotspec().get_position(self))
diff --git a/lib/matplotlib/figure.pyi b/lib/matplotlib/figure.pyi
@@ -179,7 +179,6 @@ class FigureBase(Artist):
         top: float | None = ...,
         wspace: float | None = ...,
         hspace: float | None = ...,
-        rc_default: bool = ...,
     ) -> None: ...
     def align_xlabels(self, axs: Iterable[Axes] | None = ...) -> None: ...
     def align_ylabels(self, axs: Iterable[Axes] | None = ...) -> None: ...
diff --git a/lib/matplotlib/gridspec.py b/lib/matplotlib/gridspec.py
@@ -771,11 +771,9 @@ def _repr_pretty_(self, p: Any, cycle: bool) -> None:
         p.text(s)
 
     def update(self, left=None, bottom=None, right=None, top=None,
-               wspace=None, hspace=None, rc_default=False):
+               wspace=None, hspace=None):
         """
         Update the dimensions of the passed parameters. *None* means unchanged.
-        If *rc_default* is True, then restore the parameters with value *None*
-        to the default.
         """
         if ((left if left is not None else self.left)
                 >= (right if right is not None else self.right)):
@@ -787,12 +785,14 @@ def update(self, left=None, bottom=None, right=None, top=None,
         attributes = {'left': left, 'right': right, 'bottom': bottom, 'top': top,
                           'hspace': hspace, 'wspace': wspace}
         for key, value in attributes.items():
-            if value is None:
-                if rc_default:
-                    setattr(self, key, mpl.rcParams[f'figure.subplot.{key}'])
-            else:
+            if value is not None:
                 setattr(self, key, value)
 
+    def reset(self):
+        """ Restore the positioning parameters to the default values """
+        for key in self.get_subplot_params.keys():
+            setattr(self, key, mpl.rcParams[f'figure.subplot.{key}'])
+
     def get_subplot_params(self) -> dict[str, float]:
         """
         Returns
diff --git a/lib/matplotlib/gridspec.pyi b/lib/matplotlib/gridspec.pyi
@@ -157,7 +157,6 @@ class SubplotParams:
         top: float | None = ...,
         wspace: float | None = ...,
         hspace: float | None = ...,
-        rc_default: bool = ...,
     ) -> None: ...
     def get_subplot_params(
         self,
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -2826,16 +2826,9 @@ def subplots_adjust(
     top: float | None = None,
     wspace: float | None = None,
     hspace: float | None = None,
-    rc_default: bool = False,
 ) -> None:
     gcf().subplots_adjust(
-        left=left,
-        bottom=bottom,
-        right=right,
-        top=top,
-        wspace=wspace,
-        hspace=hspace,
-        rc_default=rc_default,
+        left=left, bottom=bottom, right=right, top=top, wspace=wspace, hspace=hspace
     )
 
 
diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py
@@ -1793,22 +1793,18 @@ def test_suplots_adjust_1():
 def test_suplots_adjust_2():
     fig = plt.figure(1)
     fig.subplots_adjust(wspace=0)
-    inDict = dict(left=0.1, right=0.7, bottom=0, top=0.9, hspace=0.05,
-                  rc_default=True)
+    inDict = dict(left=0.1, right=0.7, bottom=0, top=0.9, hspace=0.05)
     fig.subplots_adjust(**inDict)
     inDict['wspace'] = plt.rcParams['figure.subplot.wspace']
-    del inDict['rc_default']
     assert fig.subplotpars.get_subplot_params() == inDict
 
 
 def test_suplots_adjust_plt():
     plt.figure(1)
     plt.subplots_adjust(wspace=0)
-    inDict = dict(left=0.1, right=0.7, bottom=0, top=0.9, hspace=0.05,
-                  rc_default=True)
+    inDict = dict(left=0.1, right=0.7, bottom=0, top=0.9, hspace=0.05)
     plt.subplots_adjust(**inDict)
     inDict['wspace'] = plt.rcParams['figure.subplot.wspace']
-    del inDict['rc_default']
     assert plt.gcf().subplotpars.get_subplot_params() == inDict
 
 
diff --git a/lib/matplotlib/tests/test_gridspec.py b/lib/matplotlib/tests/test_gridspec.py
@@ -1,4 +1,5 @@
 import unittest
+import matplotlib
 import matplotlib.gridspec as gridspec
 import matplotlib.pyplot as plt
 import pytest
@@ -51,6 +52,8 @@ def test_SubplotParams():
     with pytest.raises(ValueError):
         s = gridspec.SubplotParams(.1, .1, .09, .9)
 
+    s.reset()
+    assert s.left == matplotlib.rcParams['figure.subplot.left']
 
 def test_repr():
     ss = gridspec.GridSpec(3, 3)[2, 1:3]
