Don't go via six for callable(); related cleanups.

anntzer · anntzer · commit cdb830db7643 · 2016-12-03T14:38:38.000-08:00
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -333,7 +333,7 @@ def wrap(self, fmt, func, level='helpful', always=True):
         if always is True, the report will occur on every function
         call; otherwise only on the first time the function is called
         """
-        assert six.callable(func)
+        assert callable(func)
 
         def wrapper(*args, **kwargs):
             ret = func(*args, **kwargs)
diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py
@@ -1290,14 +1290,14 @@ def __init__(self, fig, func, frames=None, init_func=None, fargs=None,
         # will be treated as a number of frames.
         if frames is None:
             self._iter_gen = itertools.count
-        elif six.callable(frames):
+        elif callable(frames):
             self._iter_gen = frames
         elif iterable(frames):
             self._iter_gen = lambda: iter(frames)
             if hasattr(frames, '__len__'):
                 self.save_count = len(frames)
         else:
-            self._iter_gen = lambda: xrange(frames).__iter__()
+            self._iter_gen = lambda: iter(xrange(frames))
             self.save_count = frames
 
         # If we're passed in and using the default, set it to 100.
diff --git a/lib/matplotlib/artist.py b/lib/matplotlib/artist.py
@@ -392,7 +392,7 @@ def contains(self, mouseevent):
         selection, such as which points are contained in the pick radius.  See
         individual artists for details.
         """
-        if six.callable(self._contains):
+        if callable(self._contains):
             return self._contains(self, mouseevent)
         warnings.warn("'%s' needs 'contains' method" % self.__class__.__name__)
         return False, {}
@@ -435,7 +435,7 @@ def pick(self, mouseevent):
         # Pick self
         if self.pickable():
             picker = self.get_picker()
-            if six.callable(picker):
+            if picker is not None:
                 inside, prop = picker(self, mouseevent)
             else:
                 inside, prop = self.contains(mouseevent)
@@ -446,8 +446,8 @@ def pick(self, mouseevent):
         for a in self.get_children():
             # make sure the event happened in the same axes
             ax = getattr(a, 'axes', None)
-            if mouseevent.inaxes is None or ax is None or \
-                    mouseevent.inaxes == ax:
+            if (mouseevent.inaxes is None or ax is None
+                    or mouseevent.inaxes == ax):
                 # we need to check if mouseevent.inaxes is None
                 # because some objects associated with an axes (e.g., a
                 # tick label) can be outside the bounding box of the
@@ -873,7 +873,7 @@ def _update_property(self, k, v):
                 return setattr(self, k, v)
             else:
                 func = getattr(self, 'set_' + k, None)
-                if func is None or not six.callable(func):
+                if not callable(func):
                     raise AttributeError('Unknown property %s' % k)
                 return func(v)
 
@@ -1075,7 +1075,7 @@ def matchfunc(x):
         elif cbook.issubclass_safe(match, Artist):
             def matchfunc(x):
                 return isinstance(x, match)
-        elif six.callable(match):
+        elif callable(match):
             matchfunc = match
         else:
             raise ValueError('match must be None, a matplotlib.artist.Artist '
@@ -1166,9 +1166,9 @@ def get_aliases(self):
           }
 
         """
-        names = [name for name in dir(self.o) if
-                 (name.startswith('set_') or name.startswith('get_'))
-                 and six.callable(getattr(self.o, name))]
+        names = [name for name in dir(self.o)
+                 if name.startswith(('set_', 'get_'))
+                    and callable(getattr(self.o, name))]
         aliases = {}
         for name in names:
             func = getattr(self.o, name)
@@ -1222,17 +1222,14 @@ def _get_setters_and_targets(self):
         for name in dir(self.o):
             if not name.startswith('set_'):
                 continue
-            o = getattr(self.o, name)
-            if not six.callable(o):
+            func = getattr(self.o, name)
+            if not callable(func):
                 continue
             if six.PY2:
-                nargs = len(inspect.getargspec(o)[0])
+                nargs = len(inspect.getargspec(func)[0])
             else:
-                nargs = len(inspect.getfullargspec(o)[0])
-            if nargs < 2:
-                continue
-            func = o
-            if self.is_alias(func):
+                nargs = len(inspect.getfullargspec(func)[0])
+            if nargs < 2 or self.is_alias(func):
                 continue
             source_class = self.o.__module__ + "." + self.o.__name__
             for cls in self.o.mro():
@@ -1371,8 +1368,7 @@ def properties(self):
         """
         o = self.oorig
         getters = [name for name in dir(o)
-                   if name.startswith('get_')
-                   and six.callable(getattr(o, name))]
+                   if name.startswith('get_') and callable(getattr(o, name))]
         getters.sort()
         d = dict()
         for name in getters:
@@ -1432,7 +1428,7 @@ def matchfunc(x):
         elif issubclass(match, Artist):
             def matchfunc(x):
                 return isinstance(x, match)
-        elif six.callable(match):
+        elif callable(match):
             matchfunc = func
         else:
             raise ValueError('match must be None, a matplotlib.artist.Artist '
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -2664,7 +2664,7 @@ def get_next_color():
                 yt = y + pctdistance * radius * math.sin(thetam)
                 if is_string_like(autopct):
                     s = autopct % (100. * frac)
-                elif six.callable(autopct):
+                elif callable(autopct):
                     s = autopct(100. * frac)
                 else:
                     raise TypeError(
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -3807,9 +3807,8 @@ def contains(self, mouseevent):
 
         Returns *True* / *False*, {}
         """
-        if six.callable(self._contains):
+        if callable(self._contains):
             return self._contains(self, mouseevent)
-
         return self.patch.contains(mouseevent)
 
     def contains_point(self, point):
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -209,7 +209,7 @@ def contains(self, mouseevent):
         This function always returns false.  It is more useful to test if the
         axis as a whole contains the mouse rather than the set of tick marks.
         """
-        if six.callable(self._contains):
+        if callable(self._contains):
             return self._contains(self, mouseevent)
         return False, {}
 
@@ -1712,7 +1712,7 @@ class XAxis(Axis):
     def contains(self, mouseevent):
         """Test whether the mouse event occured in the x axis.
         """
-        if six.callable(self._contains):
+        if callable(self._contains):
             return self._contains(self, mouseevent)
 
         x, y = mouseevent.x, mouseevent.y
@@ -2040,7 +2040,7 @@ def contains(self, mouseevent):
 
         Returns *True* | *False*
         """
-        if six.callable(self._contains):
+        if callable(self._contains):
             return self._contains(self, mouseevent)
 
         x, y = mouseevent.x, mouseevent.y
diff --git a/lib/matplotlib/cbook.py b/lib/matplotlib/cbook.py
@@ -715,7 +715,7 @@ def is_hashable(obj):
 
 def is_writable_file_like(obj):
     """return true if *obj* looks like a file object with a *write* method"""
-    return hasattr(obj, 'write') and six.callable(obj.write)
+    return callable(getattr(obj, 'write', None))
 
 
 def file_requires_unicode(x):
diff --git a/lib/matplotlib/cm.py b/lib/matplotlib/cm.py
@@ -36,7 +36,7 @@ def revcmap(data):
     """Can only handle specification *data* in dictionary format."""
     data_r = {}
     for key, val in six.iteritems(data):
-        if six.callable(val):
+        if callable(val):
             valnew = _reverser(val)
             # This doesn't work: lambda x: val(1-x)
             # The same "val" (the first one) is used
diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
@@ -360,7 +360,7 @@ def contains(self, mouseevent):
         Returns True | False, ``dict(ind=itemlist)``, where every
         item in itemlist contains the event.
         """
-        if six.callable(self._contains):
+        if callable(self._contains):
             return self._contains(self, mouseevent)
 
         if not self.get_visible():
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -351,7 +351,7 @@ def makeMappingArray(N, data, gamma=1.0):
     gives the closest value for values of x between 0 and 1.
     """
 
-    if six.callable(data):
+    if callable(data):
         xind = np.linspace(0, 1, N) ** gamma
         lut = np.clip(np.array(data(xind), dtype=float), 0, 1)
         return lut
@@ -733,7 +733,7 @@ def func_r(x):
 
         data_r = dict()
         for key, data in six.iteritems(self._segmentdata):
-            if six.callable(data):
+            if callable(data):
                 data_r[key] = factory(data)
             else:
                 new_data = [(1.0 - x, y1, y0) for x, y0, y1 in reversed(data)]
diff --git a/lib/matplotlib/contour.py b/lib/matplotlib/contour.py
@@ -338,7 +338,7 @@ def get_text(self, lev, fmt):
         else:
             if isinstance(fmt, dict):
                 return fmt[lev]
-            elif six.callable(fmt):
+            elif callable(fmt):
                 return fmt(lev)
             else:
                 return fmt % lev
diff --git a/lib/matplotlib/dates.py b/lib/matplotlib/dates.py
@@ -683,18 +683,15 @@ def __init__(self, locator, tz=None, defaultfmt='%Y-%m-%d'):
 
     def __call__(self, x, pos=None):
         locator_unit_scale = float(self._locator._get_unit())
-        fmt = self.defaultfmt
-
         # Pick the first scale which is greater than the locator unit.
-        for possible_scale in sorted(self.scaled):
-            if possible_scale >= locator_unit_scale:
-                fmt = self.scaled[possible_scale]
-                break
+        fmt = next((fmt for scale, fmt in sorted(self.scaled.items())
+                    if scale >= locator_unit_scale),
+                   self.defaultfmt)
 
         if isinstance(fmt, six.string_types):
             self._formatter = DateFormatter(fmt, self._tz)
             result = self._formatter(x, pos)
-        elif six.callable(fmt):
+        elif callable(fmt):
             result = fmt(x, pos)
         else:
             raise TypeError('Unexpected type passed to {0!r}.'.format(self))
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -496,13 +496,11 @@ def contains(self, mouseevent):
         """
         Test whether the mouse event occurred on the figure.
 
-        Returns True,{}
+        Returns True, {}.
         """
-        if six.callable(self._contains):
+        if callable(self._contains):
             return self._contains(self, mouseevent)
-        # inside = mouseevent.x >= 0 and mouseevent.y >= 0
         inside = self.bbox.contains(mouseevent.x, mouseevent.y)
-
         return inside, {}
 
     def get_window_extent(self, *args, **kwargs):
diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py
@@ -500,7 +500,7 @@ def contains(self, mouseevent):
         """
         Test whether the mouse event occured within the image.
         """
-        if six.callable(self._contains):
+        if callable(self._contains):
             return self._contains(self, mouseevent)
         # TODO: make sure this is consistent with patch and patch
         # collection on nonlinear transformed coordinates.
@@ -514,8 +514,7 @@ def contains(self, mouseevent):
             ymin, ymax = ymax, ymin
 
         if x is not None and y is not None:
-            inside = ((x >= xmin) and (x <= xmax) and
-                      (y >= ymin) and (y <= ymax))
+            inside = (xmin <= x <= xmax) and (ymin <= y <= ymax)
         else:
             inside = False
 
@@ -1136,14 +1135,14 @@ def get_window_extent(self, renderer=None):
 
         if isinstance(self.bbox, BboxBase):
             return self.bbox
-        elif six.callable(self.bbox):
+        elif callable(self.bbox):
             return self.bbox(renderer)
         else:
             raise ValueError("unknown type of bbox")
 
     def contains(self, mouseevent):
         """Test whether the mouse event occured within the image."""
-        if six.callable(self._contains):
+        if callable(self._contains):
             return self._contains(self, mouseevent)
 
         if not self.get_visible():  # or self.get_figure()._renderer is None:
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -457,7 +457,7 @@ def contains(self, mouseevent):
 
         TODO: sort returned indices by distance
         """
-        if six.callable(self._contains):
+        if callable(self._contains):
             return self._contains(self, mouseevent)
 
         if not is_numlike(self.pickradius):
@@ -598,7 +598,7 @@ def set_picker(self, p):
         ACCEPTS: float distance in points or callable pick function
         ``fn(artist, event)``
         """
-        if six.callable(p):
+        if callable(p):
             self._contains = p
         else:
             self.pickradius = p
diff --git a/lib/matplotlib/offsetbox.py b/lib/matplotlib/offsetbox.py
@@ -217,10 +217,9 @@ def get_offset(self, width, height, xdescent, ydescent, renderer):
 
         accepts extent of the box
         """
-        if six.callable(self._offset):
-            return self._offset(width, height, xdescent, ydescent, renderer)
-        else:
-            return self._offset
+        return (self._offset(width, height, xdescent, ydescent, renderer)
+                if callable(self._offset)
+                else self._offset)
 
     def set_width(self, width):
         """
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
@@ -171,7 +171,7 @@ def contains(self, mouseevent, radius=None):
 
         Returns T/F, {}
         """
-        if six.callable(self._contains):
+        if callable(self._contains):
             return self._contains(self, mouseevent)
         radius = self._process_radius(radius)
         inside = self.get_path().contains_point(
@@ -2520,9 +2520,7 @@ def set_boxstyle(self, boxstyle=None, **kw):
         if boxstyle is None:
             return BoxStyle.pprint_styles()
 
-        if isinstance(boxstyle, BoxStyle._Base):
-            self._bbox_transmuter = boxstyle
-        elif six.callable(boxstyle):
+        if isinstance(boxstyle, BoxStyle._Base) or callable(boxstyle):
             self._bbox_transmuter = boxstyle
         else:
             self._bbox_transmuter = BoxStyle(boxstyle, **kw)
@@ -4137,10 +4135,8 @@ def set_connectionstyle(self, connectionstyle, **kw):
         if connectionstyle is None:
             return ConnectionStyle.pprint_styles()
 
-        if isinstance(connectionstyle, ConnectionStyle._Base):
-            self._connector = connectionstyle
-        elif six.callable(connectionstyle):
-            # we may need check the calling convention of the given function
+        if (isinstance(connectionstyle, ConnectionStyle._Base)
+                or callable(connectionstyle)):
             self._connector = connectionstyle
         else:
             self._connector = ConnectionStyle(connectionstyle, **kw)
diff --git a/lib/matplotlib/patheffects.py b/lib/matplotlib/patheffects.py
@@ -54,7 +54,7 @@ def _update_gc(self, gc, new_gc_dict):
 
         for k, v in six.iteritems(new_gc_dict):
             set_method = getattr(gc, 'set_' + k, None)
-            if set_method is None or not six.callable(set_method):
+            if not callable(set_method):
                 raise AttributeError('Unknown property {0}'.format(k))
             set_method(v)
         return gc
diff --git a/lib/matplotlib/table.py b/lib/matplotlib/table.py
@@ -342,7 +342,7 @@ def contains(self, mouseevent):
 
         Returns T/F, {}
         """
-        if six.callable(self._contains):
+        if callable(self._contains):
             return self._contains(self, mouseevent)
 
         # TODO: Return index of the cell containing the cursor so that the user
diff --git a/lib/matplotlib/text.py b/lib/matplotlib/text.py
