Apply unit decorator to more functions

dstansby · dstansby · commit 8a7f1a924c4c · 2018-04-18T13:21:08.000+01:00
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -385,6 +385,7 @@ def legend(self, *args, **kwargs):
     def _remove_legend(self, legend):
         self.legend_ = None
 
+    @munits._accepts_units(convert_x=['x'], convert_y=['y'])
     def text(self, x, y, s, fontdict=None, withdash=False, **kwargs):
         """
         Add text to the axes.
@@ -619,6 +620,8 @@ def axvline(self, x=0, ymin=0, ymax=1, **kwargs):
         self.autoscale_view(scalex=scalex, scaley=False)
         return l
 
+    @munits._accepts_units(convert_x=['xmin', 'xmax'],
+                           convert_y=['ymin', 'ymax'])
     @docstring.dedent_interpd
     def axhspan(self, ymin, ymax, xmin=0, xmax=1, **kwargs):
         """
@@ -660,21 +663,15 @@ def axhspan(self, ymin, ymax, xmin=0, xmax=1, **kwargs):
         axvspan : Add a vertical span across the axes.
         """
         trans = self.get_yaxis_transform(which='grid')
-
-        # process the unit information
-        self._process_unit_info([xmin, xmax], [ymin, ymax], kwargs=kwargs)
-
-        # first we need to strip away the units
-        xmin, xmax = self.convert_xunits([xmin, xmax])
-        ymin, ymax = self.convert_yunits([ymin, ymax])
-
         verts = (xmin, ymin), (xmin, ymax), (xmax, ymax), (xmax, ymin)
         p = mpatches.Polygon(verts, **kwargs)
         p.set_transform(trans)
         self.add_patch(p)
         self.autoscale_view(scalex=False)
         return p
 
+    @munits._accepts_units(convert_x=['xmin', 'xmax'],
+                           convert_y=['ymin', 'ymax'])
     def axvspan(self, xmin, xmax, ymin=0, ymax=1, **kwargs):
         """
         Add a vertical span (rectangle) across the axes.
@@ -725,21 +722,14 @@ def axvspan(self, xmin, xmax, ymin=0, ymax=1, **kwargs):
 
         """
         trans = self.get_xaxis_transform(which='grid')
-
-        # process the unit information
-        self._process_unit_info([xmin, xmax], [ymin, ymax], kwargs=kwargs)
-
-        # first we need to strip away the units
-        xmin, xmax = self.convert_xunits([xmin, xmax])
-        ymin, ymax = self.convert_yunits([ymin, ymax])
-
         verts = [(xmin, ymin), (xmin, ymax), (xmax, ymax), (xmax, ymin)]
         p = mpatches.Polygon(verts, **kwargs)
         p.set_transform(trans)
         self.add_patch(p)
         self.autoscale_view(scaley=False)
         return p
 
+    @munits._accepts_units(convert_x=['xmin', 'xmax'], convert_y=['y'])
     @_preprocess_data(replace_names=["y", "xmin", "xmax", "colors"],
                       label_namer="y")
     def hlines(self, y, xmin, xmax, colors='k', linestyles='solid',
@@ -775,14 +765,6 @@ def hlines(self, y, xmin, xmax, colors='k', linestyles='solid',
         vlines : vertical lines
         axhline: horizontal line across the axes
         """
-
-        # We do the conversion first since not all unitized data is uniform
-        # process the unit information
-        self._process_unit_info([xmin, xmax], y, kwargs=kwargs)
-        y = self.convert_yunits(y)
-        xmin = self.convert_xunits(xmin)
-        xmax = self.convert_xunits(xmax)
-
         if not iterable(y):
             y = [y]
         if not iterable(xmin):
@@ -816,6 +798,7 @@ def hlines(self, y, xmin, xmax, colors='k', linestyles='solid',
 
         return lines
 
+    @munits._accepts_units(convert_x=['x'], convert_y=['ymin', 'ymax'])
     @_preprocess_data(replace_names=["x", "ymin", "ymax", "colors"],
                       label_namer="x")
     def vlines(self, x, ymin, ymax, colors='k', linestyles='solid',
@@ -853,14 +836,6 @@ def vlines(self, x, ymin, ymax, colors='k', linestyles='solid',
         hlines : horizontal lines
         axvline: vertical line across the axes
         """
-
-        self._process_unit_info(xdata=x, ydata=[ymin, ymax], kwargs=kwargs)
-
-        # We do the conversion first since not all unitized data is uniform
-        x = self.convert_xunits(x)
-        ymin = self.convert_yunits(ymin)
-        ymax = self.convert_yunits(ymax)
-
         if not iterable(x):
             x = [x]
         if not iterable(ymin):
diff --git a/lib/matplotlib/units.py b/lib/matplotlib/units.py
@@ -50,7 +50,7 @@ def default_units(x, axis):
 from matplotlib.cbook import iterable, safe_first_element
 
 
-def _accepts_units(convert_x, convert_y):
+def _accepts_units(convert_x=[], convert_y=[]):
     """
     A decorator for functions and methods that accept units. The parameters
     indicated in *convert_x* and *convert_y* are used to update the axis
@@ -67,6 +67,7 @@ def wrapper(*args, **kwargs):
             axes = args[0]
             # Bind the incoming arguments to the function signature
             bound_args = inspect.signature(func).bind(*args, **kwargs)
+            bound_args.apply_defaults()
             # Get the original arguments - these will be modified later
             arguments = bound_args.arguments
             # Check for data kwarg
