Replace axes_size.Fraction by multiplication.

anntzer · anntzer · commit e511c48e6ac0 · 2019-12-23T20:52:43.000+01:00
axes_size defines `__rmul__` exactly for this purpose, and `*` seems
clearer to read.
diff --git a/lib/mpl_toolkits/axes_grid1/axes_grid.py b/lib/mpl_toolkits/axes_grid1/axes_grid.py
@@ -497,12 +497,12 @@ def _update_locators(self):
         if (self._colorbar_mode == "single" and
              self._colorbar_location in ('left', 'bottom')):
             if self._colorbar_location == "left":
-                sz = Size.Fraction(self._nrows, Size.AxesX(self.axes_llc))
+                sz = self._nrows * Size.AxesX(self.axes_llc)
                 h.append(Size.from_any(self._colorbar_size, sz))
                 h.append(Size.from_any(self._colorbar_pad, sz))
                 locator = self._divider.new_locator(nx=0, ny=0, ny1=-1)
             elif self._colorbar_location == "bottom":
-                sz = Size.Fraction(self._ncols, Size.AxesY(self.axes_llc))
+                sz = self._ncols * Size.AxesY(self.axes_llc)
                 v.append(Size.from_any(self._colorbar_size, sz))
                 v.append(Size.from_any(self._colorbar_pad, sz))
                 locator = self._divider.new_locator(nx=0, nx1=-1, ny=0)
@@ -602,12 +602,12 @@ def _update_locators(self):
 
         if self._colorbar_mode == "single":
             if self._colorbar_location == "right":
-                sz = Size.Fraction(self._nrows, Size.AxesX(self.axes_llc))
+                sz = self._nrows * Size.AxesX(self.axes_llc)
                 h.append(Size.from_any(self._colorbar_pad, sz))
                 h.append(Size.from_any(self._colorbar_size, sz))
                 locator = self._divider.new_locator(nx=-2, ny=0, ny1=-1)
             elif self._colorbar_location == "top":
-                sz = Size.Fraction(self._ncols, Size.AxesY(self.axes_llc))
+                sz = self._ncols * Size.AxesY(self.axes_llc)
                 v.append(Size.from_any(self._colorbar_pad, sz))
                 v.append(Size.from_any(self._colorbar_size, sz))
                 locator = self._divider.new_locator(nx=0, nx1=-1, ny=-2)
diff --git a/lib/mpl_toolkits/axes_grid1/axes_rgb.py b/lib/mpl_toolkits/axes_grid1/axes_rgb.py
@@ -14,10 +14,10 @@ def make_rgb_axes(ax, pad=0.01, axes_class=None, add_all=True):
 
     divider = make_axes_locatable(ax)
 
-    pad_size = Size.Fraction(pad, Size.AxesY(ax))
+    pad_size = pad * Size.AxesY(ax)
 
-    xsize = Size.Fraction((1.-2.*pad)/3., Size.AxesX(ax))
-    ysize = Size.Fraction((1.-2.*pad)/3., Size.AxesY(ax))
+    xsize = ((1-2*pad)/3) * Size.AxesX(ax)
+    ysize = ((1-2*pad)/3) * Size.AxesY(ax)
 
     divider.set_horizontal([Size.AxesX(ax), pad_size, xsize])
     divider.set_vertical([ysize, pad_size, ysize, pad_size, ysize])
@@ -125,10 +125,10 @@ def __init__(self, *args, pad=0, add_all=True, **kwargs):
 
         divider = make_axes_locatable(ax)
 
-        pad_size = Size.Fraction(pad, Size.AxesY(ax))
+        pad_size = pad * Size.AxesY(ax)
 
-        xsize = Size.Fraction((1.-2.*pad)/3., Size.AxesX(ax))
-        ysize = Size.Fraction((1.-2.*pad)/3., Size.AxesY(ax))
+        xsize = ((1-2*pad)/3) * Size.AxesX(ax)
+        ysize = ((1-2*pad)/3) * Size.AxesY(ax)
 
         divider.set_horizontal([Size.AxesX(ax), pad_size, xsize])
         divider.set_vertical([ysize, pad_size, ysize, pad_size, ysize])
