Merge pull request #10542 from timhoffm/minor-cleanup-pep8-pep257

jklymak · web-flow · commit aadd0e08c913 · 2018-03-09T14:09:54.000-08:00
Minor cleanup: PEP8, PEP257
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -73,9 +73,10 @@
 
 ## Backend detection ##
 def _backend_selection():
-    """ If rcParams['backend_fallback'] is true, check to see if the
-        current backend is compatible with the current running event
-        loop, and if not switches to a compatible one.
+    """
+    If rcParams['backend_fallback'] is true, check to see if the
+    current backend is compatible with the current running event loop,
+    and if not switches to a compatible one.
     """
     backend = rcParams['backend']
     if not rcParams['backend_fallback'] or backend not in _interactive_bk:
@@ -103,6 +104,7 @@ def _backend_selection():
         # import Tkinter
         pass  # what if anything do we need to do for tkinter?
 
+
 _backend_selection()
 
 ## Global ##
@@ -169,7 +171,7 @@ def post_execute():
 
 def uninstall_repl_displayhook():
     """
-    Uninstalls the matplotlib display hook.
+    Uninstall the matplotlib display hook.
 
     .. warning
 
@@ -249,20 +251,18 @@ def show(*args, **kw):
 
 
 def isinteractive():
-    """
-    Return status of interactive mode.
-    """
+    """Return the status of interactive mode."""
     return matplotlib.is_interactive()
 
 
 def ioff():
-    """Turn interactive mode off."""
+    """Turn the interactive mode off."""
     matplotlib.interactive(False)
     uninstall_repl_displayhook()
 
 
 def ion():
-    """Turn interactive mode on."""
+    """Turn the interactive mode on."""
     matplotlib.interactive(True)
     install_repl_displayhook()
 
@@ -675,9 +675,7 @@ def close(*args):
 
 
 def clf():
-    """
-    Clear the current figure.
-    """
+    """Clear the current figure."""
     gcf().clf()
 
 
diff --git a/lib/mpl_toolkits/axisartist/axislines.py b/lib/mpl_toolkits/axisartist/axislines.py
@@ -109,36 +109,26 @@ def get_tick_iterators(self, axes):
     """
 
     class _Base(object):
-        """
-        Base class for axis helper.
-        """
+        """Base class for axis helper."""
         def __init__(self):
-            """
-            """
             self.delta1, self.delta2 = 0.00001, 0.00001
 
         def update_lim(self, axes):
             pass
 
-
     class Fixed(_Base):
-        """
-        Helper class for a fixed (in the axes coordinate) axis.
-        """
+        """Helper class for a fixed (in the axes coordinate) axis."""
 
         _default_passthru_pt = dict(left=(0, 0),
                                     right=(1, 0),
                                     bottom=(0, 0),
                                     top=(0, 1))
 
-        def __init__(self,
-                     loc, nth_coord=None,
-                     ):
+        def __init__(self, loc, nth_coord=None):
             """
             nth_coord = along which coordinate value varies
             in 2d, nth_coord = 0 ->  x axis, nth_coord = 1 -> y axis
             """
-
             self._loc = loc
 
             if loc not in ["left", "right", "bottom", "top"]:
@@ -156,8 +146,6 @@ def __init__(self,
 
             self.passthru_pt = self._default_passthru_pt[loc]
 
-
-
             _verts = np.array([[0., 0.],
                                [1., 1.]])
             fixed_coord = 1-nth_coord
@@ -166,7 +154,6 @@ def __init__(self,
             # axis line in transAxes
             self._path = Path(_verts)
 
-
         def get_nth_coord(self):
             return self.nth_coord
 
@@ -197,8 +184,6 @@ def get_axislabel_pos_angle(self, axes):
 
             return pos, angle_tangent
 
-
-
         # TICK
 
         def get_tick_transform(self, axes):
@@ -221,8 +206,6 @@ def get_line(self, axes):
             raise RuntimeError("get_line method should be defined by the derived class")
 
 
-
-
 class AxisArtistHelperRectlinear(object):
 
     class Fixed(AxisArtistHelper.Fixed):
@@ -275,8 +258,6 @@ def _f(locs, labels):
 
             return _f(majorLocs, majorLabels), _f(minorLocs, minorLabels)
 
-
-
     class Floating(AxisArtistHelper.Floating):
         def __init__(self, axes, nth_coord,
                      passingthrough_point, axis_direction="bottom"):
@@ -331,12 +312,9 @@ def get_axislabel_pos_angle(self, axes):
             else:
                 return _verts, angle
 
-
-
         def get_tick_transform(self, axes):
             return axes.transData
 
-
         def get_tick_iterators(self, axes):
             """tick_loc, tick_angle, tick_label"""
 
@@ -352,7 +330,7 @@ def get_tick_iterators(self, axes):
             else:
                 angle_normal, angle_tangent = 0, 90
 
-            #angle = 90 - 90 * self.nth_coord
+            # angle = 90 - 90 * self.nth_coord
 
             major = self.axis.major
             majorLocs = major.locator()
@@ -381,17 +359,13 @@ def _f(locs, labels):
             return _f(majorLocs, majorLabels), _f(minorLocs, minorLabels)
 
 
-
-
-
 class GridHelperBase(object):
 
     def __init__(self):
         self._force_update = True
         self._old_limits = None
         super().__init__()
 
-
     def update_lim(self, axes):
         x1, x2 = axes.get_xlim()
         y1, y2 = axes.get_ylim()
@@ -401,18 +375,15 @@ def update_lim(self, axes):
             self._force_update = False
             self._old_limits = (x1, x2, y1, y2)
 
-
     def _update(self, x1, x2, y1, y2):
         pass
 
-
     def invalidate(self):
         self._force_update = True
 
     def valid(self):
         return not self._force_update
 
-
     def get_gridlines(self, which, axis):
         """
         Return list of grid lines as a list of paths (list of points).
@@ -447,14 +418,10 @@ def new_gridlines(self, ax):
 
 class GridHelperRectlinear(GridHelperBase):
 
-
     def __init__(self, axes):
-
         super().__init__()
         self.axes = axes
 
-
-
     def new_fixed_axis(self, loc,
                        nth_coord=None,
                        axis_direction=None,
@@ -476,7 +443,6 @@ def new_fixed_axis(self, loc,
 
         return axisline
 
-
     def new_floating_axis(self, nth_coord, value,
                           axis_direction="bottom",
                           axes=None,
@@ -499,40 +465,32 @@ def new_floating_axis(self, nth_coord, value,
         axisline.line.set_clip_box(axisline.axes.bbox)
         return axisline
 
-
     def get_gridlines(self, which="major", axis="both"):
         """
         return list of gridline coordinates in data coordinates.
 
         *which* : "major" or "minor"
         *axis* : "both", "x" or "y"
         """
-
         gridlines = []
 
-
         if axis in ["both", "x"]:
             locs = []
             y1, y2 = self.axes.get_ylim()
-            #if self.axes.xaxis._gridOnMajor:
             if which in ["both", "major"]:
                 locs.extend(self.axes.xaxis.major.locator())
-            #if self.axes.xaxis._gridOnMinor:
             if which in ["both", "minor"]:
                 locs.extend(self.axes.xaxis.minor.locator())
 
             for x in locs:
                 gridlines.append([[x, x], [y1, y2]])
 
-
         if axis in ["both", "y"]:
             x1, x2 = self.axes.get_xlim()
             locs = []
             if self.axes.yaxis._gridOnMajor:
-            #if which in ["both", "major"]:
                 locs.extend(self.axes.yaxis.major.locator())
             if self.axes.yaxis._gridOnMinor:
-            #if which in ["both", "minor"]:
                 locs.extend(self.axes.yaxis.minor.locator())
 
             for y in locs:
@@ -541,10 +499,6 @@ def get_gridlines(self, which="major", axis="both"):
         return gridlines
 
 
-
-
-
-
 class SimpleChainedObjects(object):
     def __init__(self, objects):
         self._objects = objects
@@ -581,24 +535,13 @@ def __getitem__(self, k):
         def __call__(self, *v, **kwargs):
             return maxes.Axes.axis(self.axes, *v, **kwargs)
 
-
-    def __init__(self, *kl, **kw):
-
-
-        helper = kw.pop("grid_helper", None)
-
+    def __init__(self, *args, grid_helper=None, **kwargs):
         self._axisline_on = True
-
-        if helper:
-            self._grid_helper = helper
-        else:
-            self._grid_helper = GridHelperRectlinear(self)
-
-        super().__init__(*kl, **kw)
-
+        self._grid_helper = (grid_helper if grid_helper
+                             else GridHelperRectlinear(self))
+        super().__init__(*args, **kwargs)
         self.toggle_axisline(True)
 
-
     def toggle_axisline(self, b=None):
         if b is None:
             b = not self._axisline_on
@@ -615,11 +558,9 @@ def toggle_axisline(self, b=None):
             self.xaxis.set_visible(True)
             self.yaxis.set_visible(True)
 
-
     def _init_axis(self):
         super()._init_axis()
 
-
     def _init_axis_artists(self, axes=None):
         if axes is None:
             axes = self
@@ -651,19 +592,14 @@ def new_gridlines(self, grid_helper=None):
             grid_helper = self.get_grid_helper()
 
         gridlines = grid_helper.new_gridlines(self)
-
         return gridlines
 
-
     def _init_gridlines(self, grid_helper=None):
         # It is done inside the cla.
-        gridlines = self.new_gridlines(grid_helper)
-
-        self.gridlines = gridlines
+        self.gridlines = self.new_gridlines(grid_helper)
 
     def cla(self):
         # gridlines need to b created before cla() since cla calls grid()
-
         self._init_gridlines()
         super().cla()
 
@@ -676,7 +612,6 @@ def cla(self):
     def get_grid_helper(self):
         return self._grid_helper
 
-
     def grid(self, b=None, which='major', axis="both", **kwargs):
         """
         Toggle the gridlines, and optionally set the properties of the lines.
@@ -715,7 +650,6 @@ def get_children(self):
     def invalidate_grid_helper(self):
         self._grid_helper.invalidate()
 
-
     def new_fixed_axis(self, loc, offset=None):
         gh = self.get_grid_helper()
         axis = gh.new_fixed_axis(loc,
@@ -727,9 +661,7 @@ def new_fixed_axis(self, loc, offset=None):
         return axis
 
 
-    def new_floating_axis(self, nth_coord, value,
-                          axis_direction="bottom",
-                          ):
+    def new_floating_axis(self, nth_coord, value, axis_direction="bottom"):
         gh = self.get_grid_helper()
         axis = gh.new_floating_axis(nth_coord, value,
                                     axis_direction=axis_direction,
