Merge pull request #26885 from ananya314/ghc-gridspec-deprecation

QuLogic · web-flow · commit f69cf6a6afca · 2023-09-25T21:52:37.000-04:00
Removed deprecated code from gridspec.py
diff --git a/ci/mypy-stubtest-allowlist.txt b/ci/mypy-stubtest-allowlist.txt
@@ -53,7 +53,6 @@ matplotlib.figure.Figure.set_tight_layout
 matplotlib.cm.register_cmap
 matplotlib.cm.unregister_cmap
 matplotlib.collections.PolyCollection.span_where
-matplotlib.gridspec.GridSpecBase.get_grid_positions
 
 # 3.8 deprecations
 matplotlib.cbook.get_sample_data
diff --git a/doc/api/next_api_changes/removals/26885-AD.rst b/doc/api/next_api_changes/removals/26885-AD.rst
@@ -0,0 +1,4 @@
+``raw`` parameter
+~~~~~~~~~~~~~~~~~
+
+... of `.GridSpecBase.get_grid_positions` is removed without replacements.
diff --git a/lib/matplotlib/gridspec.py b/lib/matplotlib/gridspec.py
@@ -141,8 +141,7 @@ def get_height_ratios(self):
         """
         return self._row_height_ratios
 
-    @_api.delete_parameter("3.7", "raw")
-    def get_grid_positions(self, fig, raw=False):
+    def get_grid_positions(self, fig):
         """
         Return the positions of the grid cells in figure coordinates.
 
@@ -151,11 +150,6 @@ def get_grid_positions(self, fig, raw=False):
         fig : `~matplotlib.figure.Figure`
             The figure the grid should be applied to. The subplot parameters
             (margins and spacing between subplots) are taken from *fig*.
-        raw : bool, default: False
-            If *True*, the subplot parameters of the figure are not taken
-            into account. The grid spans the range [0, 1] in both directions
-            without margins and there is no space between grid cells. This is
-            used for constrained_layout.
 
         Returns
         -------
@@ -164,22 +158,13 @@ def get_grid_positions(self, fig, raw=False):
             figure coordinates.
         """
         nrows, ncols = self.get_geometry()
-
-        if raw:
-            left = 0.
-            right = 1.
-            bottom = 0.
-            top = 1.
-            wspace = 0.
-            hspace = 0.
-        else:
-            subplot_params = self.get_subplot_params(fig)
-            left = subplot_params.left
-            right = subplot_params.right
-            bottom = subplot_params.bottom
-            top = subplot_params.top
-            wspace = subplot_params.wspace
-            hspace = subplot_params.hspace
+        subplot_params = self.get_subplot_params(fig)
+        left = subplot_params.left
+        right = subplot_params.right
+        bottom = subplot_params.bottom
+        top = subplot_params.top
+        wspace = subplot_params.wspace
+        hspace = subplot_params.hspace
         tot_width = right - left
         tot_height = top - bottom
 
diff --git a/lib/matplotlib/gridspec.pyi b/lib/matplotlib/gridspec.pyi
@@ -30,7 +30,7 @@ class GridSpecBase:
     def set_height_ratios(self, height_ratios: ArrayLike | None) -> None: ...
     def get_height_ratios(self) -> ArrayLike: ...
     def get_grid_positions(
-        self, fig: Figure, raw: bool = ...
+        self, fig: Figure
     ) -> tuple[np.ndarray, np.ndarray, np.ndarray, np.ndarray]: ...
     @staticmethod
     def _check_gridspec_exists(figure: Figure, nrows: int, ncols: int) -> GridSpec: ...
