TST/FLK8

jklymak · jklymak · commit 8d04411f2e44 · 2020-05-05T14:08:18.000-07:00
diff --git a/examples/subplots_axes_and_figures/compress_axes.py b/examples/subplots_axes_and_figures/compress_axes.py
@@ -50,7 +50,7 @@
                         compress_layout=True)
 for ax in axs.flat:
     ax.set_aspect(1.0)
-    pc = ax.pcolormesh(np.random.randn(20,20))
+    pc = ax.pcolormesh(np.random.randn(20, 20))
     fig.colorbar(pc, ax=ax)
 plt.show()
 
diff --git a/lib/matplotlib/_compress_layout.py b/lib/matplotlib/_compress_layout.py
@@ -72,7 +72,7 @@ def compress_layout(fig, *, bboxes=None, w_pad=0.05, h_pad=0.05,
                             dxs[i, j] = dxs[i, j] + pad / di
                         dys[i, j] = bboxes[ax].bounds[3] / dj
                         pad = np.max([h_pad, hspace * bboxes[ax].bounds[3]])
-                        if ss.rowspan[0] > 0 :
+                        if ss.rowspan[0] > 0:
                             dys[i, j] = dys[i, j] + pad / dj
                         margxs[i, j] = orpos.x0 - bboxes[ax].x0
                         margys[i, j] = orpos.y0 - bboxes[ax].y0
@@ -117,8 +117,8 @@ def compress_layout(fig, *, bboxes=None, w_pad=0.05, h_pad=0.05,
                     if cba._colorbar_info['location'] in ['bottom', 'top']:
                         # shrink to make same size as active...
                         posac = ax.get_position(original=False)
-                        dx = (1 - cba._colorbar_info['shrink']) * (posac.x1 -
-                                posac.x0) / 2
+                        dx = ((1 - cba._colorbar_info['shrink']) *
+                              (posac.x1 posac.x0) / 2)
                         pos.x0 = posac.x0 + dx
                         pos.x1 = posac.x1 - dx
                     else:
@@ -143,7 +143,7 @@ def compress_layout(fig, *, bboxes=None, w_pad=0.05, h_pad=0.05,
                     pos.x1 = x - marg
                     pos.x0 = x - marg - _dx
                 else:
-                    ddx = (x1 - x0) * (1  - cb._colorbar_info['shrink']) / 2
+                    ddx = (x1 - x0) * (1 - cb._colorbar_info['shrink']) / 2
                     marg = bbox.x0 - pos.x0
                     pos.x0 = x0 - marg + ddx
                     marg = bbox.x1 - pos.x1
@@ -177,10 +177,10 @@ def compress_layout(fig, *, bboxes=None, w_pad=0.05, h_pad=0.05,
                     if cba._colorbar_info['location'] in ['right', 'left']:
                         # shrink to make same size as active...
                         posac = ax.get_position(original=False)
-                        ddy_ = (1 - cba._colorbar_info['shrink']) * (posac.y1 -
-                                posac.y0) / 2
-                        pos.y0 = posac.y0 + ddy_
-                        pos.y1 = posac.y1 - ddy_
+                        ddy = ((1 - cba._colorbar_info['shrink']) *
+                                (posac.y1 - posac.y0) / 2)
+                        pos.y0 = posac.y0 + ddy
+                        pos.y1 = posac.y1 - ddy
                     else:
                         pos.y0 = pos.y0 + deltay
                         pos.y1 = pos.y1 + deltay
@@ -204,7 +204,7 @@ def compress_layout(fig, *, bboxes=None, w_pad=0.05, h_pad=0.05,
                     pos.y1 = y - marg
                     pos.y0 = y - marg - _dy
                 else:
-                    ddy = (y1 - y0) * (1  - cb._colorbar_info['shrink']) / 2
+                    ddy = (y1 - y0) * (1 - cb._colorbar_info['shrink']) / 2
                     marg = bbox.y0 - pos.y0
                     pos.y0 = y0 - marg + ddy
                     marg = bbox.y1 - pos.y1
diff --git a/lib/matplotlib/_constrained_layout.py b/lib/matplotlib/_constrained_layout.py
@@ -264,7 +264,7 @@ def _make_layout_margins(ax, renderer, h_pad, w_pad):
     *axes* layoutbox be a minimum size that can accommodate the
     decorations on the axis.
 
-    Returns the bbox for some width/heigth calcs outside this loop.
+    Returns the bbox for some width/height calcs outside this loop.
     """
     fig = ax.figure
     invTransFig = fig.transFigure.inverted().transform_bbox
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -10,7 +10,6 @@
 
 import logging
 from numbers import Integral
-import warnings
 
 import numpy as np
 
diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py
@@ -400,6 +400,7 @@ def test_hidden_axes():
     np.testing.assert_allclose(
         extents1, [0.045552, 0.548288, 0.47319, 0.982638], rtol=1e-5)
 
+
 def test_compressed():
     # Test that the compressed layout option works:
     fig, axs = plt.subplots(2, 2, constrained_layout=True,
@@ -431,6 +432,7 @@ def test_compressed_cbars():
     np.testing.assert_allclose(extents,
         [0.119849, 0.571899, 0.355875, 0.965277], rtol=1e-5)
 
+
 def test_compressed_onecbar():
     # Test that the compressed layout option works:
     fig, axs = plt.subplots(2, 2, constrained_layout=True,
