Add some more unit decorators

dstansby · dstansby · commit 07bf0d60f388 · 2018-04-18T13:47:25.000+01:00
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -868,6 +868,8 @@ def vlines(self, x, ymin, ymax, colors='k', linestyles='solid',
 
         return lines
 
+    @munits._accepts_units(convert_x=['positions'],
+                           convert_y=['lineoffsets', 'linelengths'])
     @_preprocess_data(replace_names=["positions", "lineoffsets",
                                      "linelengths", "linewidths",
                                      "colors", "linestyles"],
@@ -956,15 +958,6 @@ def eventplot(self, positions, orientation='horizontal', lineoffsets=1,
 
         .. plot:: gallery/lines_bars_and_markers/eventplot_demo.py
         """
-        self._process_unit_info(xdata=positions,
-                                ydata=[lineoffsets, linelengths],
-                                kwargs=kwargs)
-
-        # We do the conversion first since not all unitized data is uniform
-        positions = self.convert_xunits(positions)
-        lineoffsets = self.convert_yunits(lineoffsets)
-        linelengths = self.convert_yunits(linelengths)
-
         if not iterable(positions):
             positions = [positions]
         elif any(iterable(position) for position in positions):
@@ -4694,6 +4687,7 @@ def fill(self, *args, **kwargs):
         self.autoscale_view()
         return patches
 
+    @munits._accepts_units(convert_x=['x'], convert_y=['y1', 'y2'])
     @_preprocess_data(replace_names=["x", "y1", "y2", "where"],
                       label_namer=None)
     @docstring.dedent_interpd
@@ -4787,14 +4781,10 @@ def fill_between(self, x, y1, y2=0, where=None, interpolate=False,
                 kwargs['facecolor'] = \
                     self._get_patches_for_fill.get_next_color()
 
-        # Handle united data, such as dates
-        self._process_unit_info(xdata=x, ydata=y1, kwargs=kwargs)
-        self._process_unit_info(ydata=y2)
-
         # Convert the arrays so we can work with them
-        x = ma.masked_invalid(self.convert_xunits(x))
-        y1 = ma.masked_invalid(self.convert_yunits(y1))
-        y2 = ma.masked_invalid(self.convert_yunits(y2))
+        x = ma.masked_invalid(x)
+        y1 = ma.masked_invalid(y1)
+        y2 = ma.masked_invalid(y2)
 
         for name, array in [('x', x), ('y1', y1), ('y2', y2)]:
             if array.ndim > 1:
@@ -4877,6 +4867,7 @@ def get_interp_point(ind):
         self.autoscale_view()
         return collection
 
+    @munits._accepts_units(convert_x=['x1', 'x2'], convert_y=['y'])
     @_preprocess_data(replace_names=["y", "x1", "x2", "where"],
                       label_namer=None)
     @docstring.dedent_interpd
@@ -4970,14 +4961,10 @@ def fill_betweenx(self, y, x1, x2=0, where=None,
                 kwargs['facecolor'] = \
                     self._get_patches_for_fill.get_next_color()
 
-        # Handle united data, such as dates
-        self._process_unit_info(ydata=y, xdata=x1, kwargs=kwargs)
-        self._process_unit_info(xdata=x2)
-
         # Convert the arrays so we can work with them
-        y = ma.masked_invalid(self.convert_yunits(y))
-        x1 = ma.masked_invalid(self.convert_xunits(x1))
-        x2 = ma.masked_invalid(self.convert_xunits(x2))
+        y = ma.masked_invalid(y)
+        x1 = ma.masked_invalid(x1)
+        x2 = ma.masked_invalid(x2)
 
         for name, array in [('y', y), ('x1', x1), ('x2', x2)]:
             if array.ndim > 1:
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -26,6 +26,7 @@
 import matplotlib.font_manager as font_manager
 import matplotlib.text as mtext
 import matplotlib.image as mimage
+import matplotlib.units as munits
 from matplotlib.offsetbox import OffsetBox
 from matplotlib.artist import allow_rasterization
 from matplotlib.legend import Legend
@@ -2993,7 +2994,7 @@ def get_xlim(self):
         """
         return tuple(self.viewLim.intervalx)
 
-    def _validate_converted_limits(self, limit, convert):
+    def _validate_converted_limits(self, converted_limit):
         """
         Raise ValueError if converted limits are non-finite.
 
@@ -3004,14 +3005,13 @@ def _validate_converted_limits(self, limit, convert):
         The limit value after call to convert(), or None if limit is None.
 
         """
-        if limit is not None:
-            converted_limit = convert(limit)
+        if converted_limit is not None:
             if (isinstance(converted_limit, float) and
                     (not np.isreal(converted_limit) or
                         not np.isfinite(converted_limit))):
                 raise ValueError("Axis limits cannot be NaN or Inf")
-            return converted_limit
 
+    @munits._accepts_units(convert_x=['left', 'right'])
     def set_xlim(self, left=None, right=None, emit=True, auto=False, **kw):
         """
         Set the data limits for the x-axis
@@ -3079,9 +3079,8 @@ def set_xlim(self, left=None, right=None, emit=True, auto=False, **kw):
         if right is None and iterable(left):
             left, right = left
 
-        self._process_unit_info(xdata=(left, right))
-        left = self._validate_converted_limits(left, self.convert_xunits)
-        right = self._validate_converted_limits(right, self.convert_xunits)
+        self._validate_converted_limits(left)
+        self._validate_converted_limits(right)
 
         old_left, old_right = self.get_xlim()
         if left is None:
@@ -3332,6 +3331,7 @@ def get_ylim(self):
         """
         return tuple(self.viewLim.intervaly)
 
+    @munits._accepts_units(convert_y=['bottom', 'top'])
     def set_ylim(self, bottom=None, top=None, emit=True, auto=False, **kw):
         """
         Set the data limits for the y-axis
@@ -3398,8 +3398,8 @@ def set_ylim(self, bottom=None, top=None, emit=True, auto=False, **kw):
         if top is None and iterable(bottom):
             bottom, top = bottom
 
-        bottom = self._validate_converted_limits(bottom, self.convert_yunits)
-        top = self._validate_converted_limits(top, self.convert_yunits)
+        self._validate_converted_limits(bottom)
+        self._validate_converted_limits(top)
 
         old_bottom, old_top = self.get_ylim()
 
