Merge pull request #15113 from anntzer/layout_from_subplotspec

jklymak · web-flow · commit acfe72432489 · 2019-08-25T10:06:39.000-07:00
Cleanup layout_from_subplotspec.
diff --git a/lib/matplotlib/_layoutbox.py b/lib/matplotlib/_layoutbox.py
@@ -392,8 +392,7 @@ def layout_from_subplotspec(self, subspec,
         parent = self.parent
 
         # OK, now, we want to set the position of this subplotspec
-        # based on its subplotspec parameters.  The new gridspec will inherit.
-
+        # based on its subplotspec parameters.  The new gridspec will inherit
         # from gridspec.  prob should be new method in gridspec
         left = 0.0
         right = 1.0
@@ -406,32 +405,31 @@ def layout_from_subplotspec(self, subspec,
 
         # calculate accumulated heights of columns
         cellH = totHeight / (nrows + hspace * (nrows - 1))
-        sepH = hspace*cellH
+        sepH = hspace * cellH
 
         if gs._row_height_ratios is not None:
             netHeight = cellH * nrows
-            tr = float(sum(gs._row_height_ratios))
-            cellHeights = [netHeight*r/tr for r in gs._row_height_ratios]
+            tr = sum(gs._row_height_ratios)
+            cellHeights = [netHeight * r / tr for r in gs._row_height_ratios]
         else:
             cellHeights = [cellH] * nrows
 
         sepHeights = [0] + ([sepH] * (nrows - 1))
-        cellHs = np.add.accumulate(np.ravel(
-                list(zip(sepHeights, cellHeights))))
+        cellHs = np.cumsum(np.column_stack([sepHeights, cellHeights]).flat)
 
         # calculate accumulated widths of rows
-        cellW = totWidth/(ncols + wspace * (ncols - 1))
-        sepW = wspace*cellW
+        cellW = totWidth / (ncols + wspace * (ncols - 1))
+        sepW = wspace * cellW
 
         if gs._col_width_ratios is not None:
             netWidth = cellW * ncols
-            tr = float(sum(gs._col_width_ratios))
+            tr = sum(gs._col_width_ratios)
             cellWidths = [netWidth * r / tr for r in gs._col_width_ratios]
         else:
             cellWidths = [cellW] * ncols
 
         sepWidths = [0] + ([sepW] * (ncols - 1))
-        cellWs = np.add.accumulate(np.ravel(list(zip(sepWidths, cellWidths))))
+        cellWs = np.cumsum(np.column_stack([sepWidths, cellWidths]).flat)
 
         figTops = [top - cellHs[2 * rowNum] for rowNum in range(nrows)]
         figBottoms = [top - cellHs[2 * rowNum + 1] for rowNum in range(nrows)]
