Cleanup axislines style.

anntzer · anntzer · commit b751ccc8318a · 2018-10-03T12:11:59.000+02:00
diff --git a/.flake8 b/.flake8
@@ -57,7 +57,6 @@ per-file-ignores =
     mpl_toolkits/axes_grid1/inset_locator.py: E501
     mpl_toolkits/axes_grid1/mpl_axes.py: E501
     mpl_toolkits/axisartist/angle_helper.py: E221
-    mpl_toolkits/axisartist/axislines.py: E225, E501
     mpl_toolkits/axisartist/clip_path.py: E225, E501
     mpl_toolkits/axisartist/floating_axes.py: E225, E402, E501
     mpl_toolkits/axisartist/grid_helper_curvelinear.py: E225, E501
diff --git a/lib/mpl_toolkits/axisartist/axislines.py b/lib/mpl_toolkits/axisartist/axislines.py
@@ -5,14 +5,13 @@
 class. Originally, this change was motivated to support curvilinear
 grid. Here are a few reasons that I came up with a new axes class:
 
+* "top" and "bottom" x-axis (or "left" and "right" y-axis) can have
+  different ticks (tick locations and labels). This is not possible
+  with the current mpl, although some twin axes trick can help.
 
- * "top" and "bottom" x-axis (or "left" and "right" y-axis) can have
-   different ticks (tick locations and labels). This is not possible
-   with the current mpl, although some twin axes trick can help.
+* Curvilinear grid.
 
- * Curvilinear grid.
-
- * angled ticks.
+* angled ticks.
 
 In the new axes class, xaxis and yaxis is set to not visible by
 default, and new set of artist (AxisArtist) are defined to draw axis
@@ -24,11 +23,11 @@
 AxisArtist can be considered as a container artist and
 has following children artists which will draw ticks, labels, etc.
 
- * line
- * major_ticks, major_ticklabels
- * minor_ticks, minor_ticklabels
- * offsetText
- * label
+* line
+* major_ticks, major_ticklabels
+* minor_ticks, minor_ticklabels
+* offsetText
+* label
 
 Note that these are separate artists from Axis class of the
 original mpl, thus most of tick-related command in the original mpl
@@ -198,7 +197,8 @@ def get_nth_coord(self):
             return self.nth_coord
 
         def get_line(self, axes):
-            raise RuntimeError("get_line method should be defined by the derived class")
+            raise RuntimeError(
+                "get_line method should be defined by the derived class")
 
 
 class AxisArtistHelperRectlinear(object):
@@ -228,12 +228,14 @@ def get_tick_iterators(self, axes):
             major = self.axis.major
             majorLocs = major.locator()
             major.formatter.set_locs(majorLocs)
-            majorLabels = [major.formatter(val, i) for i, val in enumerate(majorLocs)]
+            majorLabels = [major.formatter(val, i)
+                           for i, val in enumerate(majorLocs)]
 
             minor = self.axis.minor
             minorLocs = minor.locator()
             minor.formatter.set_locs(minorLocs)
-            minorLabels = [minor.formatter(val, i) for i, val in enumerate(minorLocs)]
+            minorLabels = [minor.formatter(val, i)
+                           for i, val in enumerate(minorLocs)]
 
             trans_tick = self.get_tick_transform(axes)
 
@@ -247,7 +249,9 @@ def _f(locs, labels):
 
                     # check if the tick point is inside axes
                     c2 = tr2ax.transform_point(c)
-                    if 0 - self.delta1 <= c2[self.nth_coord] <= 1 + self.delta2:
+                    if (0 - self.delta1
+                            <= c2[self.nth_coord]
+                            <= 1 + self.delta2):
                         yield c, angle_normal, angle_tangent, l
 
             return _f(majorLocs, majorLabels), _f(minorLocs, minorLabels)
@@ -263,10 +267,9 @@ def get_line(self, axes):
             _verts = np.array([[0., 0.],
                                [1., 1.]])
 
-            fixed_coord = 1-self.nth_coord
-            trans_passingthrough_point = axes.transData + axes.transAxes.inverted()
-            p = trans_passingthrough_point.transform_point([self._value,
-                                                            self._value])
+            fixed_coord = 1 - self.nth_coord
+            p = (axes.transData + axes.transAxes.inverted()).transform_point(
+                [self._value, self._value])
             _verts[:, fixed_coord] = p[fixed_coord]
 
             return Path(_verts)
@@ -297,9 +300,8 @@ def get_axislabel_pos_angle(self, axes):
             _verts = [0.5, 0.5]
 
             fixed_coord = 1-self.nth_coord
-            trans_passingthrough_point = axes.transData + axes.transAxes.inverted()
-            p = trans_passingthrough_point.transform_point([self._value,
-                                                            self._value])
+            p = (axes.transData + axes.transAxes.inverted()).transform_point(
+                [self._value, self._value])
             _verts[fixed_coord] = p[fixed_coord]
             if not (0. <= _verts[fixed_coord] <= 1.):
                 return None, None
@@ -329,12 +331,14 @@ def get_tick_iterators(self, axes):
             major = self.axis.major
             majorLocs = major.locator()
             major.formatter.set_locs(majorLocs)
-            majorLabels = [major.formatter(val, i) for i, val in enumerate(majorLocs)]
+            majorLabels = [major.formatter(val, i)
+                           for i, val in enumerate(majorLocs)]
 
             minor = self.axis.minor
             minorLocs = minor.locator()
             minor.formatter.set_locs(minorLocs)
-            minorLabels = [minor.formatter(val, i) for i, val in enumerate(minorLocs)]
+            minorLabels = [minor.formatter(val, i)
+                           for i, val in enumerate(minorLocs)]
 
             tr2ax = axes.transData + axes.transAxes.inverted()
 
@@ -424,7 +428,8 @@ def new_fixed_axis(self, loc,
                        ):
 
         if axes is None:
-            warnings.warn("'new_fixed_axis' explicitly requires the axes keyword.")
+            warnings.warn(
+                "'new_fixed_axis' explicitly requires the axes keyword.")
             axes = self.axes
 
         _helper = AxisArtistHelperRectlinear.Fixed(axes, loc, nth_coord)
@@ -615,12 +620,10 @@ def grid(self, b=None, which='major', axis="both", **kwargs):
             return
 
         if b is None:
-
-            if self.axes.xaxis._gridOnMinor or self.axes.xaxis._gridOnMajor or \
-                   self.axes.yaxis._gridOnMinor or self.axes.yaxis._gridOnMajor:
-                b=True
-            else:
-                b=False
+            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)
