pep8 fixes

matplotlib · rmorshea · Aug 6, 2015 · Jul 20, 2015 · Jul 21, 2015 · Jul 23, 2015
commit 0064153e6cb44b49b3400834ba13a86949e906ed
diff --git a/lib/matplotlib/artist.py b/lib/matplotlib/artist.py
@@ -15,10 +15,11 @@
                          TransformedPatchPath, TransformedPath, Transform)
 from .path import Path
 
-from .traitlets import (Instance, Configurable, TransformInstance, Bool, Undefined, Union,
-                        BaseDescriptor, getargspec, PrivateMethodMixin, Float, TraitError,
-                        Unicode, Stringlike, Callable, Tuple, List, observe, validate, default,
-                        retrieve, _traitlets_deprecation_msg)
+from .traitlets import (Instance, Configurable, TransformInstance, Bool,
+                        Undefined, Union, BaseDescriptor, getargspec,
+                        PrivateMethodMixin, Float, TraitError, Unicode,
+                        Stringlike, Callable, Tuple, List, observe, validate,
+                        default, retrieve, _traitlets_deprecation_msg)
 
 
 # Note, matplotlib artists use the doc strings for set and get
@@ -126,13 +127,13 @@ def _stale_changed(self, change):
     @observe('axes')
     def _axes_changed(self, change):
         new, old = change['new'], change['old']
-        if new and old not in (Undefined,None):
+        if new and old not in (Undefined, None):
             raise ValueError("Can not reset the axes.  You are "
                              "probably trying to re-use an artist "
                              "in more than one Axes which is not "
                              "supported")
 
-        if new not in (Undefined,None) and new is not self:
+        if new not in (Undefined, None) and new is not self:
             self.stale_callback = _stale_axes_callback
 
     figure = Instance(str('matplotlib.figure.FigureBase'), allow_none=True)
@@ -166,7 +167,7 @@ def _animated_changed(self, change):
 
     @validate('alpha')
     def _alpha_validate(self, commit):
-        if 0>commit['value']>1:
+        if 0 > commit['value'] > 1:
             msg = ("The '%s' trait of %s instance can only be"
                    " transparent (0.0) through opaque (1.0)")
             repl = (commit['trait'].name, self.__class__.__name__)
@@ -242,7 +243,7 @@ def _clipon_changed(self, change):
     def _label_changed(self, change):
         self.pchanged()
 
-    picker = Union((Bool(),Float(),Callable()), allow_none=True)
+    picker = Union((Bool(), Float(), Callable()), allow_none=True)
 
     @default('picker')
     def _picker_default(self): pass
@@ -795,12 +796,14 @@ def get_sketch_params(self):
 
         May return `None` if no sketch parameters were set.
         """
-        msg = ("This has been deprecated to make way for IPython's Traitlets. Please"
-               " use the 'sketch_params' property or the TraitTypes it references.")
+        msg = ("This has been deprecated to make way for IPython's"
+               " Traitlets. Please use the 'sketch_params' property"
+               " or the TraitTypes it references.")
         warnings.warn(msg, mplDeprecation, stacklevel=1)
         return self.sketch_params
 
-    def set_sketch_params(self, scale=None, length=None, randomness=None, all=None):
+    def set_sketch_params(self, scale=None, length=None,
+                            randomness=None, all=None):
         """
         Sets the sketch parameters.
 
@@ -1078,7 +1081,7 @@ def update(self, props):
             else:
                 #!DEPRICATED set_name access should eventually be removed
                 klass = self.__class__
-                if isinstance(getattr(klass, k, None),BaseDescriptor):
+                if isinstance(getattr(klass, k, None), BaseDescriptor):
                     setattr(self, k, v)
                 else:
                     func = getattr(self, 'set_' + k, None)
@@ -1164,7 +1167,7 @@ def set(self, **kwargs):
                 ret.extend([func(v)])
             else:
                 klass = self.__class__
-                if isinstance(getattr(klass, k, None),BaseDescriptor):
+                if isinstance(getattr(klass, k, None), BaseDescriptor):
                     ret.extend([setattr(self, k, v)])
                 else:
                     raise TypeError('There is no %s property "%s"' %
@@ -1600,15 +1603,16 @@ def getp(obj, property=None):
         print('\n'.join(ret))
         return
 
-    func = getattr(obj, 'get_' + property, None)
-    if func is not None and six.callable(func):
-        return func()
+    klass = obj.__class__
+    if isinstance(getattr(klass, property, None), BaseDescriptor):
+        return getattr(obj, property)
     else:
-        klass = obj.__class__
-        if isinstance(getattr(klass, property, None),BaseDescriptor):
-            return getattr(obj, property)
+        func = getattr(obj, 'get_' + property, None)
+        if func is not None and six.callable(func):
+            return func()
         else:
-            raise AttributeError('Unknown property %s for %s' % (property,str(obj)))
+            msg = 'Unknown property %s for %s'
+            raise AttributeError(msg % (property, str(obj)))
 
 # alias
 get = getp
@@ -1691,7 +1695,7 @@ def setp(obj, *args, **kwargs):
                 ret.extend([func(val)])
             else:
                 klass = o.__class__
-                if isinstance(getattr(klass, s, None),BaseDescriptor):
+                if isinstance(getattr(klass, s, None), BaseDescriptor):
                     ret.extend([setattr(o, s, val)])
                 else:
                     raise TypeError('There is no %s property "%s"' %

diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -258,7 +258,7 @@ def _get_legend_handles(self, legend_handler_map=None):
         has_handler = mlegend.Legend.get_legend_handler
 
         for handle in handles_original:
-            label = handle.label if hasattr(handle,'label') else handle.get_label()
+            label = handle.label if hasattr(handle, 'label') else handle.get_label()
             if label != '_nolegend_' and has_handler(handler_map, handle):
                 yield handle
 
@@ -274,10 +274,10 @@ def get_legend_handles_labels(self, legend_handler_map=None):
         """
         handles = []
         labels = []
-        for handle in self._get_legend_handles(legend_handler_map):
-            label = handle.label if hasattr(handle,'label') else handle.get_label()
+        for h in self._get_legend_handles(legend_handler_map):
+            label = h.label if hasattr(h, 'label') else h.get_label()
             if label and not label.startswith('_'):
-                handles.append(handle)
+                handles.append(h)
                 labels.append(label)
 
         return handles, labels

diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -515,7 +515,6 @@ def __init__(self, fig, rect,
         else:
             self.figure = fig
 
-
         self.set_axes_locator(kwargs.get("axes_locator", None))
 
         self.spines = self._gen_axes_spines()
@@ -599,7 +598,7 @@ def _figure_changed(self, change):
         martist.Artist._figure_changed(self, change)
 
         tbox = mtransforms.TransformedBbox
-        self.bbox = tbox(self._position,change['new'].transFigure)
+        self.bbox = tbox(self._position, change['new'].transFigure)
 
         # these will be updated later as data is added
         self.dataLim = mtransforms.Bbox.null()

diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -700,7 +700,7 @@ def get_scale(self):
     def _set_scale(self, value, **kwargs):
         self._scale = mscale.scale_factory(value, self, **kwargs)
         self._scale.set_default_locators_and_formatters(self)
-        
+
         self.isDefault_majloc = True
         self.isDefault_minloc = True
         self.isDefault_majfmt = True

diff --git a/lib/matplotlib/contour.py b/lib/matplotlib/contour.py
@@ -755,6 +755,7 @@ def _find_closest_point_on_path(lc, point):
 
     return (dmin, xcmin, legmin)
 
+
 class ContourSet(cm.ScalarMappable, ContourLabeler):
     """
     Store a set of contour lines or filled regions.

diff --git a/lib/matplotlib/dates.py b/lib/matplotlib/dates.py
@@ -1152,9 +1152,9 @@ def __init__(self, base=1, month=1, day=1, tz=None):
         """
         DateLocator.__init__(self, tz)
         self.base = ticker.Base(base)
-        self.replaced = {'month':  month,
-                         'day':    day,
-                         'hour':   0,
+        self.replaced = {'month': month,
+                         'day': day,
+                         'hour': 0,
                          'minute': 0,
                          'second': 0,
                          'tzinfo': tz
@@ -1531,7 +1531,7 @@ def axisinfo(unit, axis):
         The *axis* argument is required but not used.
         """
         tz = unit
-        
+
         majloc = AutoDateLocator(tz=tz)
         majfmt = AutoDateFormatter(majloc, tz=tz)
         datemin = datetime.date(2000, 1, 1)

diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -239,10 +239,12 @@ def _update_this(self, s, val):
 
         setattr(self, s, val)
 
-# used solely for passing an empty figure class to
-# the "figure" attribute of an artist which will pass
-# a boolean test (e.g `True if figure else False`)
-class FigureBase(object): pass
+# used solely for giving an empty figure class to
+# the "figure" attribute of an artist which performs
+# a type check (e.g `True if figure else False`)
+class FigureBase(object):
+    pass
+
 
 class Figure(FigureBase, Artist):
 

diff --git a/lib/matplotlib/offsetbox.py b/lib/matplotlib/offsetbox.py
@@ -586,6 +586,7 @@ def draw_frame(self, renderer):
         if self._drawFrame:
             self.patch.draw(renderer)
 
+
 class DrawingArea(OffsetBox):
     """
     The DrawingArea can contain any Artist as a child. The DrawingArea

diff --git a/lib/matplotlib/quiver.py b/lib/matplotlib/quiver.py
@@ -459,9 +459,9 @@ def __init__(self, ax, *args, **kw):
         # that can be easily warned because defining a property to raise it
         # will override the traittype defined at the class level.
         self.quiver_transform = kw.pop('transform', ax.transData)
-            
+
         kw.setdefault('facecolors', self.color)
-        kw.setdefault('linewidths', (0,))
+        kw.setdefault('linewidths', (0, ))
         mcollections.PolyCollection.__init__(self, [], offsets=self.XY,
                                              transOffset=self.quiver_transform,
                                              closed=False,

diff --git a/lib/matplotlib/table.py b/lib/matplotlib/table.py
@@ -298,7 +298,7 @@ def add_cell(self, row, col, *args, **kwargs):
         cell = CustomCell(xy, visible_edges=self.edges, *args, **kwargs)
         cell.figure = self.figure
         cell.transform = self.transform
-        
+
         self._cells[(row, col)] = cell
         self.stale = True
-Original file line number
+Diff line change
@@ Expand Up / @@ -755,6 +755,7 @@ def _find_closest_point_on_path(lc, point): @@
         return (dmin, xcmin, legmin)
     class ContourSet(cm.ScalarMappable, ContourLabeler):
         """
         Store a set of contour lines or filled regions.
@@ Expand Down @@