Fix overindented lines.

anntzer · anntzer · commit c664fb0a1dbb · 2020-03-11T00:38:25.000+01:00
This is basically pycodestyle's E127 check, except that pycodestyle is
incorrectly too strict in a few places so we can't enforce it
automatically.
diff --git a/examples/images_contours_and_fields/tricontour_smooth_delaunay.py b/examples/images_contours_and_fields/tricontour_smooth_delaunay.py
@@ -124,11 +124,11 @@ def experiment_res(x, y):
 
 # 1) plot of the refined (computed) data contours:
 ax.tricontour(tri_refi, z_test_refi, levels=levels, cmap=cmap,
-               linewidths=[2.0, 0.5, 1.0, 0.5])
+              linewidths=[2.0, 0.5, 1.0, 0.5])
 # 2) plot of the expected (analytical) data contours (dashed):
 if plot_expected:
     ax.tricontour(tri_refi, z_expected, levels=levels, cmap=cmap,
-                   linestyles='--')
+                  linestyles='--')
 # 3) plot of the fine mesh on which interpolation was done:
 if plot_refi_tri:
     ax.triplot(tri_refi, color='0.97')
diff --git a/examples/images_contours_and_fields/tricontour_smooth_user.py b/examples/images_contours_and_fields/tricontour_smooth_user.py
@@ -69,8 +69,8 @@ def function_z(x, y):
 cmap = cm.get_cmap(name='terrain', lut=None)
 ax.tricontourf(tri_refi, z_test_refi, levels=levels, cmap=cmap)
 ax.tricontour(tri_refi, z_test_refi, levels=levels,
-               colors=['0.25', '0.5', '0.5', '0.5', '0.5'],
-               linewidths=[1.0, 0.5, 0.5, 0.5, 0.5])
+              colors=['0.25', '0.5', '0.5', '0.5', '0.5'],
+              linewidths=[1.0, 0.5, 0.5, 0.5, 0.5])
 
 ax.set_title("High-resolution tricontouring")
 
diff --git a/lib/matplotlib/_cm.py b/lib/matplotlib/_cm.py
@@ -240,12 +240,22 @@ def _g36(x): return 2 * x - 1
                        (0.857143, 0.937500, 0.937500),
                        (1.0, 0.09375, 0.09375))}
 
-_jet_data = {'red':   ((0., 0, 0), (0.35, 0, 0), (0.66, 1, 1), (0.89, 1, 1),
-                         (1, 0.5, 0.5)),
-             'green': ((0., 0, 0), (0.125, 0, 0), (0.375, 1, 1), (0.64, 1, 1),
-                         (0.91, 0, 0), (1, 0, 0)),
-             'blue':  ((0., 0.5, 0.5), (0.11, 1, 1), (0.34, 1, 1),
-                         (0.65, 0, 0), (1, 0, 0))}
+_jet_data = {'red':   ((0.00, 0, 0),
+                       (0.35, 0, 0),
+                       (0.66, 1, 1),
+                       (0.89, 1, 1),
+                       (1.00, 0.5, 0.5)),
+             'green': ((0.000, 0, 0),
+                       (0.125, 0, 0),
+                       (0.375, 1, 1),
+                       (0.640, 1, 1),
+                       (0.910, 0, 0),
+                       (1.000, 0, 0)),
+             'blue':  ((0.00, 0.5, 0.5),
+                       (0.11, 1, 1),
+                       (0.34, 1, 1),
+                       (0.65, 0, 0),
+                       (1.00, 0, 0))}
 
 _pink_data = {'red':   ((0., 0.1178, 0.1178), (0.015873, 0.195857, 0.195857),
                         (0.031746, 0.250661, 0.250661),
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -115,8 +115,7 @@ def get_title(self, loc="center"):
         title = cbook._check_getitem(titles, loc=loc.lower())
         return title.get_text()
 
-    def set_title(self, label, fontdict=None, loc=None, pad=None,
-                    **kwargs):
+    def set_title(self, label, fontdict=None, loc=None, pad=None, **kwargs):
         """
         Set a title for the axes.
 
@@ -1418,8 +1417,8 @@ def eventplot(self, positions, orientation='horizontal', lineoffsets=1,
 
         colls = []
         for position, lineoffset, linelength, linewidth, color, linestyle in \
-            zip(positions, lineoffsets, linelengths, linewidths,
-                           colors, linestyles):
+                zip(positions, lineoffsets, linelengths, linewidths,
+                    colors, linestyles):
             coll = mcoll.EventCollection(position,
                                          orientation=orientation,
                                          lineoffset=lineoffset,
@@ -8102,7 +8101,7 @@ def violin(self, vpstats, positions=None, vert=True, widths=0.5,
                     ppmaxs = np.concatenate((ppmaxs, [cmax] * np.size(q)))
             # Start rendering
             artists['cquantiles'] = perp_lines(quantiles, ppmins, ppmaxs,
-                                                 colors=edgecolor)
+                                               colors=edgecolor)
 
         return artists
 
diff --git a/lib/matplotlib/axes/_secondary_axes.py b/lib/matplotlib/axes/_secondary_axes.py
@@ -39,8 +39,7 @@ class SecondaryAxis(_AxesBase):
     General class to hold a Secondary_X/Yaxis.
     """
 
-    def __init__(self, parent, orientation,
-                  location, functions, **kwargs):
+    def __init__(self, parent, orientation, location, functions, **kwargs):
         """
         See `.secondary_xaxis` and `.secondary_yaxis` for the doc string.
         While there is no need for this to be private, it should really be
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -346,10 +346,10 @@ def get_view_interval(self):
 
     def _apply_params(self, **kw):
         for name, target in [("gridOn", self.gridline),
-                               ("tick1On", self.tick1line),
-                               ("tick2On", self.tick2line),
-                               ("label1On", self.label1),
-                               ("label2On", self.label2)]:
+                             ("tick1On", self.tick1line),
+                             ("tick2On", self.tick2line),
+                             ("label1On", self.label1),
+                             ("label2On", self.label2)]:
             if name in kw:
                 target.set_visible(kw.pop(name))
         if any(k in kw for k in ['size', 'width', 'pad', 'tickdir']):
diff --git a/lib/matplotlib/backends/qt_editor/_formlayout.py b/lib/matplotlib/backends/qt_editor/_formlayout.py
@@ -566,4 +566,4 @@ def apply_test(data):
     print("result:", fedit(((datagroup, "Title 1", "Tab 1 comment"),
                             (datalist, "Title 2", "Tab 2 comment"),
                             (datalist, "Title 3", "Tab 3 comment")),
-                            "Global title"))
+                           "Global title"))
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -257,10 +257,9 @@ def __init__(self,
                  edgecolor=None,
                  linewidth=0.0,
                  frameon=None,
-                 subplotpars=None,  # default to rc
-                 tight_layout=None,  # default to rc figure.autolayout
-                 constrained_layout=None,  # default to rc
-                                          #figure.constrained_layout.use
+                 subplotpars=None,  # rc figure.subplot.*
+                 tight_layout=None,  # rc figure.autolayout
+                 constrained_layout=None,  # rc figure.constrained_layout.use
                  ):
         """
         Parameters
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -2713,7 +2713,7 @@ def symbol(self, s, loc, toks):
                 return [Hlist([self._make_space(0.2),
                                char,
                                self._make_space(0.2)],
-                               do_kern = True)]
+                              do_kern=True)]
         elif c in self._punctuation_symbols:
 
             # Do not space commas between brackets
@@ -2727,9 +2727,7 @@ def symbol(self, s, loc, toks):
             if c == '.' and s[loc - 1].isdigit() and s[loc + 1].isdigit():
                 return [char]
             else:
-                return [Hlist([char,
-                               self._make_space(0.2)],
-                               do_kern = True)]
+                return [Hlist([char, self._make_space(0.2)], do_kern=True)]
         return [char]
 
     accentprefixed = symbol
diff --git a/lib/matplotlib/projections/polar.py b/lib/matplotlib/projections/polar.py
@@ -900,7 +900,7 @@ def draw(self, *args, **kwargs):
         if thetamin > thetamax:
             thetamin, thetamax = thetamax, thetamin
         rmin, rmax = ((self._realViewLim.intervaly - self.get_rorigin()) *
-                        self.get_rsign())
+                      self.get_rsign())
         if isinstance(self.patch, mpatches.Wedge):
             # Backwards-compatibility: Any subclassed Axes might override the
             # patch to not be the Wedge that PolarAxes uses.
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -1014,7 +1014,7 @@ def subplot(*args, **kwargs):
     # Check for nrows and ncols, which are not valid subplot args:
     if 'nrows' in kwargs or 'ncols' in kwargs:
         raise TypeError("subplot() got an unexpected keyword argument 'ncols' "
-                         "and/or 'nrows'.  Did you intend to call subplots()?")
+                        "and/or 'nrows'.  Did you intend to call subplots()?")
 
     fig = gcf()
     ax = fig.add_subplot(*args, **kwargs)
diff --git a/lib/matplotlib/tests/test_arrow_patches.py b/lib/matplotlib/tests/test_arrow_patches.py
@@ -42,10 +42,10 @@ def test_boxarrow():
 
     for i, stylename in enumerate(sorted(styles)):
         fig.text(0.5, ((n - i) * spacing - 0.5)/figheight, stylename,
-                  ha="center",
-                  size=fontsize,
-                  transform=fig.transFigure,
-                  bbox=dict(boxstyle=stylename, fc="w", ec="k"))
+                 ha="center",
+                 size=fontsize,
+                 transform=fig.transFigure,
+                 bbox=dict(boxstyle=stylename, fc="w", ec="k"))
 
 
 def __prepare_fancyarrow_dpi_cor_test():
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -1756,7 +1756,7 @@ def test_bar_pandas(pd):
 def test_bar_pandas_indexed(pd):
     # Smoke test for indexed pandas
     df = pd.DataFrame({"x": [1., 2., 3.], "width": [.2, .4, .6]},
-                       index=[1, 2, 3])
+                      index=[1, 2, 3])
     fig, ax = plt.subplots()
     ax.bar(df.x, 1., width=df.width)
 
@@ -5441,8 +5441,8 @@ def test_title_xticks_top():
 def test_title_xticks_top_both():
     # Test that title moves if xticks on top of axes.
     fig, ax = plt.subplots()
-    ax.tick_params(axis="x", bottom=True, top=True,
-                             labelbottom=True, labeltop=True)
+    ax.tick_params(axis="x",
+                   bottom=True, top=True, labelbottom=True, labeltop=True)
     ax.set_title('xlabel top')
     fig.canvas.draw()
     assert ax.title.get_position()[1] > 1.04
diff --git a/lib/matplotlib/tests/test_backend_nbagg.py b/lib/matplotlib/tests/test_backend_nbagg.py
@@ -23,7 +23,6 @@ def test_ipynb():
         with out_path.open() as out:
             nb = nbformat.read(out, nbformat.current_nbformat)
 
-    errors = [output for cell in nb.cells if "outputs" in cell
-                     for output in cell["outputs"]
-                     if output.output_type == "error"]
+    errors = [output for cell in nb.cells for output in cell.get("outputs", [])
+              if output.output_type == "error"]
     assert not errors
diff --git a/lib/matplotlib/tests/test_colorbar.py b/lib/matplotlib/tests/test_colorbar.py
@@ -282,27 +282,22 @@ def test_colorbar_minorticks_on_off():
         im = ax.pcolormesh(data, vmin=-2.3, vmax=3.3)
 
         cbar = fig.colorbar(im, extend='both')
-        cbar.minorticks_on()
-        correct_minorticklocs = np.array([-2.2, -1.8, -1.6, -1.4, -1.2, -0.8,
-                                          -0.6, -0.4, -0.2, 0.2, 0.4, 0.6,
-                                           0.8, 1.2, 1.4, 1.6, 1.8, 2.2, 2.4,
-                                           2.6, 2.8, 3.2])
         # testing after minorticks_on()
-        np.testing.assert_almost_equal(cbar.ax.yaxis.get_minorticklocs(),
-                                       correct_minorticklocs)
-        cbar.minorticks_off()
+        cbar.minorticks_on()
+        np.testing.assert_almost_equal(
+            cbar.ax.yaxis.get_minorticklocs(),
+            [-2.2, -1.8, -1.6, -1.4, -1.2, -0.8, -0.6, -0.4, -0.2,
+             0.2, 0.4, 0.6, 0.8, 1.2, 1.4, 1.6, 1.8, 2.2, 2.4, 2.6, 2.8, 3.2])
         # testing after minorticks_off()
-        np.testing.assert_almost_equal(cbar.ax.yaxis.get_minorticklocs(),
-                                       np.array([]))
+        cbar.minorticks_off()
+        np.testing.assert_almost_equal(cbar.ax.yaxis.get_minorticklocs(), [])
 
         im.set_clim(vmin=-1.2, vmax=1.2)
         cbar.minorticks_on()
-        correct_minorticklocs = np.array([-1.2, -1.1, -0.9, -0.8, -0.7, -0.6,
-                                          -0.4, -0.3, -0.2, -0.1,  0.1, 0.2,
-                                           0.3,  0.4,  0.6,  0.7,  0.8,  0.9,
-                                           1.1,  1.2])
-        np.testing.assert_almost_equal(cbar.ax.yaxis.get_minorticklocs(),
-                                       correct_minorticklocs)
+        np.testing.assert_almost_equal(
+            cbar.ax.yaxis.get_minorticklocs(),
+            [-1.2, -1.1, -0.9, -0.8, -0.7, -0.6, -0.4, -0.3, -0.2, -0.1,
+             0.1, 0.2, 0.3, 0.4, 0.6, 0.7, 0.8, 0.9, 1.1, 1.2])
 
     # tests for github issue #13257 and PR #13265
     data = np.random.uniform(low=1, high=10, size=(20, 20))
diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py
@@ -110,8 +110,9 @@ def test_constrained_layout6():
 
 def test_constrained_layout7():
     """Test for proper warning if fig not set in GridSpec"""
-    with pytest.warns(UserWarning, match='Calling figure.constrained_layout, '
-                            'but figure not setup to do constrained layout'):
+    with pytest.warns(
+        UserWarning, match=('Calling figure.constrained_layout, but figure '
+                            'not setup to do constrained layout')):
         fig = plt.figure(constrained_layout=True)
         gs = gridspec.GridSpec(1, 2)
         gsl = gridspec.GridSpecFromSubplotSpec(2, 2, gs[0])
diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py
@@ -629,7 +629,7 @@ def test_bbox_image_inverted():
 
     bbox_im = BboxImage(TransformedBbox(Bbox([[0.1, 0.2], [0.3, 0.25]]),
                                         ax.figure.transFigure),
-                                        interpolation='nearest')
+                        interpolation='nearest')
     bbox_im.set_data(image)
     bbox_im.set_clip_on(False)
     ax.add_artist(bbox_im)
diff --git a/lib/matplotlib/tests/test_patches.py b/lib/matplotlib/tests/test_patches.py
@@ -391,7 +391,7 @@ def test_connection_patch():
     coordsA = "axes fraction"
     coordsB = ax2.get_yaxis_transform()
     con = mpatches.ConnectionPatch(xyA=xyA, xyB=xyB, coordsA=coordsA,
-                                    coordsB=coordsB, arrowstyle="-")
+                                   coordsB=coordsB, arrowstyle="-")
     ax2.add_artist(con)
 
 
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
@@ -1419,7 +1419,7 @@ def format_eng(self, num):
         # instead of 1 k.  Beware of the corner case of values that are beyond
         # the range of SI prefixes (i.e. > 'Y').
         if (abs(float(format(mant, fmt))) >= 1000
-                   and pow10 < max(self.ENG_PREFIXES)):
+                and pow10 < max(self.ENG_PREFIXES)):
             mant /= 1000
             pow10 += 3
 
diff --git a/lib/matplotlib/transforms.py b/lib/matplotlib/transforms.py
@@ -135,10 +135,9 @@ def __setstate__(self, data_dict):
         # turn the normal dictionary back into a dictionary with weak values
         # The extra lambda is to provide a callback to remove dead
         # weakrefs from the dictionary when garbage collection is done.
-        self._parents = {k: weakref.ref(v, lambda ref, sid=k,
-                                                  target=self._parents:
-                                                        target.pop(sid))
-                         for k, v in self._parents.items() if v is not None}
+        self._parents = {
+            k: weakref.ref(v, lambda _, pop=self._parents.pop, k=k: pop(k))
+            for k, v in self._parents.items() if v is not None}
 
     def __copy__(self, *args):
         raise NotImplementedError(
@@ -197,8 +196,8 @@ def set_children(self, *children):
             # Use weak references so this dictionary won't keep obsolete nodes
             # alive; the callback deletes the dictionary entry. This is a
             # performance improvement over using WeakValueDictionary.
-            ref = weakref.ref(self, lambda ref, sid=id(self),
-                                        target=child._parents: target.pop(sid))
+            ref = weakref.ref(
+                self, lambda _, pop=child._parents.pop, k=id(self): pop(k))
             child._parents[id(self)] = ref
 
     if DEBUG:
@@ -2522,7 +2521,7 @@ def get_matrix(self):
             self._mtx = np.array([[outw,  0.0, outl],
                                   [ 0.0, outh, outb],
                                   [ 0.0,  0.0,  1.0]],
-                                  float)
+                                 float)
             self._inverted = None
             self._invalid = 0
         return self._mtx
diff --git a/lib/mpl_toolkits/axisartist/angle_helper.py b/lib/mpl_toolkits/axisartist/angle_helper.py
@@ -375,14 +375,14 @@ def __call__(self, transform_xy, x1, y1, x2, y2):
         lat_min, lat_max = np.nanmin(lat), np.nanmax(lat)
 
         lon_min, lon_max, lat_min, lat_max = \
-                 self._adjust_extremes(lon_min, lon_max, lat_min, lat_max)
+            self._adjust_extremes(lon_min, lon_max, lat_min, lat_max)
 
         return lon_min, lon_max, lat_min, lat_max
 
     def _adjust_extremes(self, lon_min, lon_max, lat_min, lat_max):
 
         lon_min, lon_max, lat_min, lat_max = \
-                 self._add_pad(lon_min, lon_max, lat_min, lat_max)
+            self._add_pad(lon_min, lon_max, lat_min, lat_max)
 
         # check cycle
         if self.lon_cycle:
diff --git a/lib/mpl_toolkits/axisartist/axislines.py b/lib/mpl_toolkits/axisartist/axislines.py
@@ -42,7 +42,6 @@
 import numpy as np
 
 from matplotlib import cbook, rcParams
-import matplotlib.artist as martist
 import matplotlib.axes as maxes
 from matplotlib.path import Path
 from mpl_toolkits.axes_grid1 import mpl_axes
@@ -537,23 +536,16 @@ def grid(self, b=None, which='major', axis="both", **kwargs):
         # their are some discrepancy between the behavior of grid in
         # axes_grid and the original mpl's grid, because axes_grid
         # explicitly set the visibility of the gridlines.
-
         super().grid(b, which=which, axis=axis, **kwargs)
         if not self._axisline_on:
             return
-
         if b is None:
             b = (self.axes.xaxis._gridOnMinor
-                    or self.axes.xaxis._gridOnMajor
-                    or self.axes.yaxis._gridOnMinor
-                    or self.axes.yaxis._gridOnMajor)
-
-        self.gridlines.set_which(which)
-        self.gridlines.set_axis(axis)
-        self.gridlines.set_visible(b)
-
-        if len(kwargs):
-            martist.setp(self.gridlines, **kwargs)
+                 or self.axes.xaxis._gridOnMajor
+                 or self.axes.yaxis._gridOnMinor
+                 or self.axes.yaxis._gridOnMajor)
+        self.gridlines.set(which=which, axis=axis, visible=b)
+        self.gridlines.set(**kwargs)
 
     def get_children(self):
         if self._axisline_on:
diff --git a/lib/mpl_toolkits/axisartist/floating_axes.py b/lib/mpl_toolkits/axisartist/floating_axes.py
@@ -236,9 +236,9 @@ def _update_grid(self, x1, y1, x2, y2):
         lon_min, lon_max = sorted(extremes[:2])
         lat_min, lat_max = sorted(extremes[2:])
         lon_levs, lon_n, lon_factor = \
-                  grid_finder.grid_locator1(lon_min, lon_max)
+            grid_finder.grid_locator1(lon_min, lon_max)
         lat_levs, lat_n, lat_factor = \
-                  grid_finder.grid_locator2(lat_min, lat_max)
+            grid_finder.grid_locator2(lat_min, lat_max)
         grid_info["extremes"] = lon_min, lon_max, lat_min, lat_max  # extremes
 
         grid_info["lon_info"] = lon_levs, lon_n, lon_factor
diff --git a/lib/mpl_toolkits/axisartist/grid_helper_curvelinear.py b/lib/mpl_toolkits/axisartist/grid_helper_curvelinear.py
