Merge pull request matplotlib#14529 from anntzer/toolkitstyle

timhoffm · web-flow · commit ef3a17a821d5 · 2019-06-12T08:20:43.000+02:00
mpl_toolkits style fixes.
diff --git a/.flake8 b/.flake8
@@ -43,12 +43,8 @@ per-file-ignores =
     lib/matplotlib/transforms.py: E201, E202, E203
     lib/matplotlib/tri/triinterpolate.py: E201, E221
 
-    lib/mpl_toolkits/axes_grid1/axes_divider.py: E402, E501
     lib/mpl_toolkits/axes_grid1/axes_size.py: E272
-    lib/mpl_toolkits/axes_grid1/colorbar.py: E225, E501
     lib/mpl_toolkits/axisartist/angle_helper.py: E221
-    lib/mpl_toolkits/axisartist/clip_path.py: E225
-    lib/mpl_toolkits/axisartist/grid_helper_curvelinear.py: E225, E501
 
     doc/conf.py: E402, E501
     doc/sphinxext/github.py: E302, E501
diff --git a/lib/mpl_toolkits/axes_grid1/axes_divider.py b/lib/mpl_toolkits/axes_grid1/axes_divider.py
@@ -604,7 +604,8 @@ def new_vertical(self, size, pad=None, pack_start=False, **kwargs):
             locator = self.new_locator(nx=self._xrefindex, ny=0)
         else:
             self._vertical.append(size)
-            locator = self.new_locator(nx=self._xrefindex, ny=len(self._vertical)-1)
+            locator = self.new_locator(
+                nx=self._xrefindex, ny=len(self._vertical)-1)
         ax = self._get_new_axes(**kwargs)
         ax.set_axes_locator(locator)
         return ax
diff --git a/lib/mpl_toolkits/axes_grid1/colorbar.py b/lib/mpl_toolkits/axes_grid1/colorbar.py
@@ -151,9 +151,9 @@
     cbar.solids.set_edgecolor("face")
     draw()
 
-However this has negative consequences in other circumstances. Particularly with
-semi transparent images (alpha < 1) and colorbar extensions and is not enabled
-by default see (issue #1188).
+However this has negative consequences in other circumstances. Particularly
+with semi transparent images (alpha < 1) and colorbar extensions and is not
+enabled by default see (issue #1188).
 
 returns:
     :class:`~matplotlib.colorbar.Colorbar` instance; see also its base class,
@@ -468,9 +468,9 @@ def _add_ends(self):
         del self.extension_patch2
 
         path1, path2 = self.ax.get_axes_locator().get_path_ends()
-        fc=mpl.rcParams['axes.facecolor']
-        ec=mpl.rcParams['axes.edgecolor']
-        linewidths=0.5*mpl.rcParams['axes.linewidth']
+        fc = mpl.rcParams['axes.facecolor']
+        ec = mpl.rcParams['axes.edgecolor']
+        linewidths = 0.5 * mpl.rcParams['axes.linewidth']
         self.extension_patch1 = PathPatch(path1,
                                           fc=fc, ec=ec, lw=linewidths,
                                           zorder=2.,
diff --git a/lib/mpl_toolkits/axisartist/clip_path.py b/lib/mpl_toolkits/axisartist/clip_path.py
@@ -38,7 +38,7 @@ def clip(xlines, ylines, x0, clip="right", xdir=True, ydir=True):
         else:
             ns = -1
         segx, segy = [], []
-        for (i,) in np.argwhere(db!=0):
+        for (i,) in np.argwhere(db):
             c = db[i]
             if c == -1:
                 dx = (x0 - x[i])
diff --git a/lib/mpl_toolkits/axisartist/grid_helper_curvelinear.py b/lib/mpl_toolkits/axisartist/grid_helper_curvelinear.py
@@ -221,7 +221,7 @@ def transform_xy(x, y):
             xx1, yy1 = transform_xy(xx0, yy0)
 
             xx00 = xx0.copy()
-            xx00[xx0+dx>e1] -= dx
+            xx00[xx0 + dx > e1] -= dx
             xx1a, yy1a = transform_xy(xx00, yy0)
             xx1b, yy1b = transform_xy(xx00+dx, yy0)
 
@@ -240,7 +240,7 @@ def transform_xy(x, y):
             xx1b, yy1b = transform_xy(xx0, yy0+dy)
 
             xx00 = xx0.copy()
-            xx00[xx0+dx>e1] -= dx
+            xx00[xx0 + dx > e1] -= dx
             xx2a, yy2a = transform_xy(xx00, yy0)
             xx2b, yy2b = transform_xy(xx00+dx, yy0)
 
@@ -250,7 +250,7 @@ def transform_xy(x, y):
         def f1():
             dd = np.arctan2(yy1b-yy1a, xx1b-xx1a)  # angle normal
             dd2 = np.arctan2(yy2b-yy2a, xx2b-xx2a)  # angle tangent
-            mm = (yy1b-yy1a == 0) & (xx1b-xx1a == 0)  # mask where dd1 is not defined
+            mm = (yy1b == yy1a) & (xx1b == xx1a)  # mask where dd not defined
             dd[mm] = dd2[mm] + np.pi / 2
 
             trans_tick = self.get_tick_transform(axes)
@@ -387,13 +387,15 @@ def get_tick_iterator(self, nth_coord, axis_side, minor=False):
         # angle = [0, 90, 180, 270][axisnr]
         lon_or_lat = ["lon", "lat"][nth_coord]
         if not minor:  # major ticks
-            for (xy, a), l in zip(self.grid_info[lon_or_lat]["tick_locs"][axis_side],
-                                  self.grid_info[lon_or_lat]["tick_labels"][axis_side]):
+            for (xy, a), l in zip(
+                    self.grid_info[lon_or_lat]["tick_locs"][axis_side],
+                    self.grid_info[lon_or_lat]["tick_labels"][axis_side]):
                 angle_normal = a
                 yield xy, angle_normal, angle_tangent, l
         else:
-            for (xy, a), l in zip(self.grid_info[lon_or_lat]["tick_locs"][axis_side],
-                                  self.grid_info[lon_or_lat]["tick_labels"][axis_side]):
+            for (xy, a), l in zip(
+                    self.grid_info[lon_or_lat]["tick_locs"][axis_side],
+                    self.grid_info[lon_or_lat]["tick_labels"][axis_side]):
                 angle_normal = a
                 yield xy, angle_normal, angle_tangent, ""
             # for xy, a, l in self.grid_info[lon_or_lat]["ticks"][axis_side]:
