FIXes

jklymak · jklymak · commit 5380aa1d7dda · 2022-05-28T13:43:56.000+02:00
diff --git a/lib/matplotlib/_constrained_layout.py b/lib/matplotlib/_constrained_layout.py
@@ -265,7 +265,6 @@ def compress_fixed_aspect(layoutgrids, fig):
     gs = None
     for ax in fig.axes:
         if hasattr(ax, 'get_subplotspec'):
-            actual = ax.get_position(original=False)
             ax.apply_aspect()
             sub = ax.get_subplotspec()
             _gs = sub.get_gridspec()
@@ -285,18 +284,17 @@ def compress_fixed_aspect(layoutgrids, fig):
             if dh > 0:
                 extrah[sub.rowspan] = np.maximum(extrah[sub.rowspan], dh)
 
-    if gs is not None:
-        w = np.sum(extraw) / 2
-        layoutgrids[fig].edit_margin_min('left', w)
-        layoutgrids[fig].edit_margin_min('right', w)
-
-        h = np.sum(extrah) / 2
-        layoutgrids[fig].edit_margin_min('top', h)
-        layoutgrids[fig].edit_margin_min('bottom', h)
-        return layoutgrids
-    else:
+    if gs is None:
         raise ValueError('Cannot do compressed layout if no axes '
                          'are part of a gridspec.')
+    w = np.sum(extraw) / 2
+    layoutgrids[fig].edit_margin_min('left', w)
+    layoutgrids[fig].edit_margin_min('right', w)
+
+    h = np.sum(extrah) / 2
+    layoutgrids[fig].edit_margin_min('top', h)
+    layoutgrids[fig].edit_margin_min('bottom', h)
+    return layoutgrids
 
 
 def get_margin_from_padding(obj, *, w_pad=0, h_pad=0,
diff --git a/lib/matplotlib/layout_engine.py b/lib/matplotlib/layout_engine.py
@@ -216,7 +216,6 @@ def __init__(self, *, h_pad=None, w_pad=None,
         # set anything that was passed in (None will be ignored):
         self.set(w_pad=w_pad, h_pad=h_pad, wspace=wspace, hspace=hspace,
                  rect=rect)
-        # see CompressedLayoutEngine below...
         self._compress = compress
 
     def execute(self, fig):
diff --git a/tutorials/intermediate/constrainedlayout_guide.py b/tutorials/intermediate/constrainedlayout_guide.py
@@ -399,7 +399,7 @@ def example_plot(ax, fontsize=12, hide_labels=False):
 # the same effect can be achieved using `~.Figure.subfigures`.
 
 fig = plt.figure()
-gs0 = fig.add_gridspec(1, 2, figure=fig, width_ratios=[1., 2.])
+gs0 = fig.add_gridspec(1, 2, figure=fig, width_ratios=[1, 2])
 gs_left = gs0[0].subgridspec(2, 1)
 gs_right = gs0[1].subgridspec(2, 2)
 
@@ -424,17 +424,17 @@ def example_plot(ax, fontsize=12, hide_labels=False):
 fig = plt.figure()
 sfigs = fig.subfigures(1, 2, width_ratios=[1, 2])
 
-axsleft = sfigs[0].subplots(2, 1)
-for ax in axsleft.flat:
+axs_left = sfigs[0].subplots(2, 1)
+for ax in axs_left.flat:
     example_plot(ax)
 
-axsright = sfigs[1].subplots(2, 2)
-for ax in axsright.flat:
+axs_right = sfigs[1].subplots(2, 2)
+for ax in axs_right.flat:
     pcm = ax.pcolormesh(arr, **pc_kwargs)
     ax.set_xlabel('x-label')
     ax.set_ylabel('y-label')
     ax.set_title('title')
-fig.colorbar(pcm, ax=axsright)
+fig.colorbar(pcm, ax=axs_right)
 fig.suptitle('Nested plots using subfigures')
 
 ###############################################################################
@@ -467,7 +467,8 @@ def example_plot(ax, fontsize=12, hide_labels=False):
     ax.imshow(arr)
 fig.suptitle("fixed-aspect plots, layout='constrained'")
 
-# One obvious way of fixing this is to make the figure size more square,
+###############################################################################
+#  One obvious way of fixing this is to make the figure size more square,
 # however, closing the gaps exactly requires trial and error.  For simple grids
 # of Axes we can use ``layout="compressed"`` to do the job for us:
 
