Merge pull request #6 from tacaswell/unpack_labeled_data_alternative

More fixes

Author: jankatins

boilerplate.py

@@ -212,10 +212,7 @@ def format_value(value):
             # Get argspec of wrapped function
             base_func = getattr(Axes, func)
             has_data = 'data' in inspect.signature(base_func).parameters
-            if hasattr(base_func, '__wrapped__'):
-                work_func = base_func.__wrapped__
-            else:
-                work_func = base_func
+            work_func = inspect.unwrap(base_func)
 
             args, varargs, varkw, defaults = inspect.getargspec(work_func)
 

lib/matplotlib/__init__.py

@@ -1603,23 +1603,24 @@ def param(func):
             else:
                 python_has_signature = True
         else:
-            signature = inspect.signature
-            Parameter = inspect.Parameter
+            if python_has_signature:
+                signature = inspect.signature
+                Parameter = inspect.Parameter
 
         if not python_has_signature:
             arg_spec = inspect.getargspec(func)
             _arg_names = arg_spec.args
-            _has_no_varargs = arg_spec.varargs is None
+            _has_varargs = arg_spec.varargs is not None
             _has_varkwargs = arg_spec.keywords is not None
         else:
             sig = signature(func)
-            _has_no_varargs = True
+            _has_varargs = False
             _has_varkwargs = False
             _arg_names = []
             params = list(sig.parameters.values())
             for p in params:
                 if p.kind is Parameter.VAR_POSITIONAL:
-                    _has_no_varargs = False
+                    _has_varargs = True
                 elif p.kind is Parameter.VAR_KEYWORD:
                     _has_varkwargs = True
                 else:
@@ -1638,7 +1639,7 @@ def param(func):
         # positional args can end up in **kwargs, so only *varargs make
         # problems.
         # http://stupidpythonideas.blogspot.de/2013/08/arguments-and-parameters.html
-        if _has_no_varargs:
+        if not _has_varargs:
             # all args are "named", so no problem
             # remove the first "ax" / self arg
             arg_names = _arg_names[1:]

lib/matplotlib/axes/_axes.py

@@ -5641,15 +5641,15 @@ def pcolorfast(self, *args, **kwargs):
         self.autoscale_view(tight=True)
         return ret
 
-    #@unpack_labeled_data() # takes 2d data :-(
+    @unpack_labeled_data()
     def contour(self, *args, **kwargs):
         if not self._hold:
             self.cla()
         kwargs['filled'] = False
         return mcontour.QuadContourSet(self, *args, **kwargs)
     contour.__doc__ = mcontour.QuadContourSet.contour_doc
 
-    #@unpack_labeled_data() # takes 2d data :-(
+    @unpack_labeled_data()
     def contourf(self, *args, **kwargs):
         if not self._hold:
             self.cla()

lib/matplotlib/axes/_base.py

@@ -15,7 +15,7 @@
 import matplotlib
 
 from matplotlib import cbook
-from matplotlib.cbook import _string_to_bool, iterable, get_index_y, get_label
+from matplotlib.cbook import _string_to_bool, iterable, index_of, get_label
 from matplotlib import docstring
 import matplotlib.colors as mcolors
 import matplotlib.lines as mlines
@@ -31,7 +31,7 @@
 import matplotlib.image as mimage
 from matplotlib.offsetbox import OffsetBox
 from matplotlib.artist import allow_rasterization
-from matplotlib.cbook import iterable, get_index_y
+from matplotlib.cbook import iterable, index_of
 from matplotlib.rcsetup import cycler
 
 rcParams = matplotlib.rcParams
@@ -356,7 +356,7 @@ def _plot_args(self, tup, kwargs):
             x = np.atleast_1d(tup[0])
             y = np.atleast_1d(tup[-1])
         else:
-            x, y = get_index_y(tup[-1])
+            x, y = index_of(tup[-1])
 
         x, y = self._xy_from_xy(x, y)
 

lib/matplotlib/cbook.py

@@ -2491,7 +2491,7 @@ def pts_to_midstep(x, *args):
                    'step-mid': pts_to_midstep}
 
 
-def get_index_y(y):
+def index_of(y):
     """
     A helper function to get the index of an input to plot
     against if x values are not explicitly given.