Merge pull request #16769 from QuLogic/style-fixes

anntzer · web-flow · commit 8e8749338094 · 2020-03-29T11:59:32.000+02:00
Fix some small style issues
diff --git a/.flake8 b/.flake8
@@ -4,7 +4,7 @@ ignore =
     # Normal default
     E121,E123,E126,E226,E24,E704,W503,W504,
     # Additional ignores:
-    E122, E125, E127, E129, E131,
+    E122, E127, E131,
     E265, E266,
     E305, E306,
     E722, E741,
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -1158,7 +1158,7 @@ def _init_tests():
 
     from matplotlib import ft2font
     if (ft2font.__freetype_version__ != LOCAL_FREETYPE_VERSION or
-        ft2font.__freetype_build_type__ != 'local'):
+            ft2font.__freetype_build_type__ != 'local'):
         _log.warning(
             f"Matplotlib is not built with the correct FreeType version to "
             f"run tests.  Rebuild without setting system_freetype=1 in "
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -5825,7 +5825,7 @@ def pcolor(self, *args, shading=None, alpha=None, norm=None, cmap=None,
         # Transform from native to data coordinates?
         t = collection._transform
         if (not isinstance(t, mtransforms.Transform) and
-            hasattr(t, '_as_mpl_transform')):
+                hasattr(t, '_as_mpl_transform')):
             t = t._as_mpl_transform(self.axes)
 
         if t and any(t.contains_branch_seperately(self.transData)):
@@ -6057,7 +6057,7 @@ def pcolormesh(self, *args, alpha=None, norm=None, cmap=None, vmin=None,
         # Transform from native to data coordinates?
         t = collection._transform
         if (not isinstance(t, mtransforms.Transform) and
-            hasattr(t, '_as_mpl_transform')):
+                hasattr(t, '_as_mpl_transform')):
             t = t._as_mpl_transform(self.axes)
 
         if t and any(t.contains_branch_seperately(self.transData)):
@@ -6209,7 +6209,7 @@ def pcolorfast(self, *args, alpha=None, norm=None, cmap=None, vmin=None,
                     dx = np.diff(x)
                     dy = np.diff(y)
                     if (np.ptp(dx) < 0.01 * abs(dx.mean()) and
-                        np.ptp(dy) < 0.01 * abs(dy.mean())):
+                            np.ptp(dy) < 0.01 * abs(dy.mean())):
                         style = "image"
                     else:
                         style = "pcolorimage"
diff --git a/lib/matplotlib/axes/_secondary_axes.py b/lib/matplotlib/axes/_secondary_axes.py
@@ -189,7 +189,7 @@ def set_functions(self, functions):
             inverse.
         """
         if (isinstance(functions, tuple) and len(functions) == 2 and
-            callable(functions[0]) and callable(functions[1])):
+                callable(functions[0]) and callable(functions[1])):
             # make an arbitrary convert from a two-tuple of functions
             # forward and inverse.
             self._functions = functions
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -23,9 +23,9 @@
 
 # This list is being used for compatibility with Axes.grid, which
 # allows all Line2D kwargs.
-_line_AI = martist.ArtistInspector(mlines.Line2D)
-_line_param_names = _line_AI.get_setters()
-_line_param_aliases = [list(d)[0] for d in _line_AI.aliasd.values()]
+_line_inspector = martist.ArtistInspector(mlines.Line2D)
+_line_param_names = _line_inspector.get_setters()
+_line_param_aliases = [list(d)[0] for d in _line_inspector.aliasd.values()]
 _gridline_param_names = ['grid_' + name
                          for name in _line_param_names + _line_param_aliases]
 
diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py
@@ -1344,9 +1344,8 @@ def __init__(self, toolmanager, parent, style=wx.TB_HORIZONTAL):
         self._toolitems = {}
         self._groups = {}
 
-    def add_toolitem(
-        self, name, group, position, image_file, description, toggle):
-
+    def add_toolitem(self, name, group, position, image_file, description,
+                     toggle):
         before, group = self._add_to_group(group, name, position)
         idx = self.GetToolPos(before.Id)
         if image_file:
diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
@@ -197,7 +197,7 @@ def get_datalim(self, transData):
         transform = self.get_transform()
         transOffset = self.get_offset_transform()
         if (not self._offsetsNone and
-            not transOffset.contains_branch(transData)):
+                not transOffset.contains_branch(transData)):
             # if there are offsets but in some coords other than data,
             # then don't use them for autoscaling.
             return transforms.Bbox.null()
@@ -329,11 +329,11 @@ def draw(self, renderer):
         edgecolors = self.get_edgecolor()
         do_single_path_optimization = False
         if (len(paths) == 1 and len(trans) <= 1 and
-            len(facecolors) == 1 and len(edgecolors) == 1 and
-            len(self._linewidths) == 1 and
-            all(ls[1] is None for ls in self._linestyles) and
-            len(self._antialiaseds) == 1 and len(self._urls) == 1 and
-            self.get_hatch() is None):
+                len(facecolors) == 1 and len(edgecolors) == 1 and
+                len(self._linewidths) == 1 and
+                all(ls[1] is None for ls in self._linestyles) and
+                len(self._antialiaseds) == 1 and len(self._urls) == 1 and
+                self.get_hatch() is None):
             if len(trans):
                 combined_transform = transforms.Affine2D(trans[0]) + transform
             else:
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -631,12 +631,8 @@ def __init__(self,
         if isinstance(family, str):
             # Treat family as a fontconfig pattern if it is the only
             # parameter provided.
-            if (style is None and
-                variant is None and
-                weight is None and
-                stretch is None and
-                size is None and
-                fname is None):
+            if (style is None and variant is None and weight is None and
+                    stretch is None and size is None and fname is None):
                 self.set_fontconfig_pattern(family)
                 return
 
diff --git a/lib/matplotlib/scale.py b/lib/matplotlib/scale.py
@@ -109,8 +109,8 @@ def set_default_locators_and_formatters(self, axis):
         axis.set_major_formatter(ScalarFormatter())
         axis.set_minor_formatter(NullFormatter())
         # update the minor locator for x and y axis based on rcParams
-        if (axis.axis_name == 'x' and mpl.rcParams['xtick.minor.visible']
-            or axis.axis_name == 'y' and mpl.rcParams['ytick.minor.visible']):
+        if (axis.axis_name == 'x' and mpl.rcParams['xtick.minor.visible'] or
+                axis.axis_name == 'y' and mpl.rcParams['ytick.minor.visible']):
             axis.set_minor_locator(AutoMinorLocator())
         else:
             axis.set_minor_locator(NullLocator())
@@ -194,8 +194,8 @@ def set_default_locators_and_formatters(self, axis):
         axis.set_major_formatter(ScalarFormatter())
         axis.set_minor_formatter(NullFormatter())
         # update the minor locator for x and y axis based on rcParams
-        if (axis.axis_name == 'x' and mpl.rcParams['xtick.minor.visible']
-            or axis.axis_name == 'y' and mpl.rcParams['ytick.minor.visible']):
+        if (axis.axis_name == 'x' and mpl.rcParams['xtick.minor.visible'] or
+                axis.axis_name == 'y' and mpl.rcParams['ytick.minor.visible']):
             axis.set_minor_locator(AutoMinorLocator())
         else:
             axis.set_minor_locator(NullLocator())
diff --git a/lib/matplotlib/tests/test_agg.py b/lib/matplotlib/tests/test_agg.py
@@ -101,7 +101,7 @@ class BaseFilter:
         def get_pad(self, dpi):
             return 0
 
-        def process_image(padded_src, dpi):
+        def process_image(self, padded_src, dpi):
             raise NotImplementedError("Should be overridden by subclasses")
 
         def __call__(self, im, dpi):
diff --git a/lib/matplotlib/transforms.py b/lib/matplotlib/transforms.py
@@ -228,8 +228,7 @@ def _check(points):
             if isinstance(points, np.ma.MaskedArray):
                 cbook._warn_external("Bbox bounds are a masked array.")
             points = np.asarray(points)
-            if (points[1, 0] - points[0, 0] == 0 or
-                points[1, 1] - points[0, 1] == 0):
+            if any((points[1, :] - points[0, :]) == 0):
                 cbook._warn_external("Singular Bbox.")
 
     def frozen(self):
@@ -2170,8 +2169,8 @@ def blended_transform_factory(x_transform, y_transform):
     A faster version of the blended transform is returned for the case
     where both child transforms are affine.
     """
-    if (isinstance(x_transform, Affine2DBase)
-        and isinstance(y_transform, Affine2DBase)):
+    if (isinstance(x_transform, Affine2DBase) and
+            isinstance(y_transform, Affine2DBase)):
         return BlendedAffine2D(x_transform, y_transform)
     return BlendedGenericTransform(x_transform, y_transform)
 
@@ -2222,10 +2221,9 @@ def _invalidate_internal(self, value, invalidating_node):
         # either:
         # (a) the left hand transform is non affine
         # (b) it is the left hand node which has triggered the invalidation
-        if value == Transform.INVALID_AFFINE \
-            and not self._b.is_affine \
-            and (not self._a.is_affine or invalidating_node is self._a):
-
+        if (value == Transform.INVALID_AFFINE and
+                not self._b.is_affine and
+                (not self._a.is_affine or invalidating_node is self._a)):
             value = Transform.INVALID
 
         Transform._invalidate_internal(self, value=value,
@@ -2566,7 +2564,7 @@ def _revalidate(self):
         # only recompute if the invalidation includes the non_affine part of
         # the transform
         if (self._invalid & self.INVALID_NON_AFFINE == self.INVALID_NON_AFFINE
-            or self._transformed_path is None):
+                or self._transformed_path is None):
             self._transformed_path = \
                 self._transform.transform_path_non_affine(self._path)
             self._transformed_points = \
diff --git a/lib/mpl_toolkits/axes_grid1/inset_locator.py b/lib/mpl_toolkits/axes_grid1/inset_locator.py
@@ -487,8 +487,8 @@ def inset_axes(parent_axes, width, height, loc='upper right',
     if bbox_to_anchor is None:
         bbox_to_anchor = parent_axes.bbox
 
-    if isinstance(bbox_to_anchor, tuple) and \
-        (isinstance(width, str) or isinstance(height, str)):
+    if (isinstance(bbox_to_anchor, tuple) and
+            (isinstance(width, str) or isinstance(height, str))):
         if len(bbox_to_anchor) != 4:
             raise ValueError("Using relative units for width or height "
                              "requires to provide a 4-tuple or a "
diff --git a/tutorials/colors/colormap-manipulation.py b/tutorials/colors/colormap-manipulation.py
@@ -138,8 +138,8 @@ def plot_examples(colormaps):
 # middle 0.5 of the colormap.  However, we need to interpolate from a larger
 # colormap, otherwise the new colormap will have repeated values.
 
-viridisBig = cm.get_cmap('viridis', 512)
-newcmp = ListedColormap(viridisBig(np.linspace(0.25, 0.75, 256)))
+viridis_big = cm.get_cmap('viridis', 512)
+newcmp = ListedColormap(viridis_big(np.linspace(0.25, 0.75, 256)))
 plot_examples([viridis, newcmp])
 
 ##############################################################################
