Add unit decorator to mplot3d

dstansby · dstansby · commit f427d561ddb6 · 2018-04-18T14:38:06.000+01:00
diff --git a/lib/mpl_toolkits/mplot3d/axes3d.py b/lib/mpl_toolkits/mplot3d/axes3d.py
@@ -29,6 +29,7 @@
 import matplotlib.docstring as docstring
 import matplotlib.scale as mscale
 import matplotlib.transforms as mtransforms
+import matplotlib.units as munits
 from matplotlib.axes import Axes, rcParams
 from matplotlib.colors import Normalize, LightSource
 from matplotlib.transforms import Bbox
@@ -609,6 +610,7 @@ def _determine_lims(self, xmin=None, xmax=None, *args, **kwargs):
             xmax += 0.05
         return (xmin, xmax)
 
+    @munits._accepts_units(convert_x=['left', 'right'])
     def set_xlim3d(self, left=None, right=None, emit=True, auto=False, **kw):
         """
         Set 3D x limits.
@@ -626,9 +628,8 @@ def set_xlim3d(self, left=None, right=None, emit=True, auto=False, **kw):
         if right is None and cbook.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:
@@ -661,6 +662,7 @@ def set_xlim3d(self, left=None, right=None, emit=True, auto=False, **kw):
         return left, right
     set_xlim = set_xlim3d
 
+    @munits._accepts_units(convert_y=['bottom', 'top'])
     def set_ylim3d(self, bottom=None, top=None, emit=True, auto=False, **kw):
         """
         Set 3D y limits.
@@ -678,9 +680,8 @@ def set_ylim3d(self, bottom=None, top=None, emit=True, auto=False, **kw):
         if top is None and cbook.iterable(bottom):
             bottom, top = bottom
 
-        self._process_unit_info(ydata=(bottom, top))
-        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()
         if bottom is None:
@@ -731,8 +732,10 @@ def set_zlim3d(self, bottom=None, top=None, emit=True, auto=False, **kw):
             bottom, top = bottom
 
         self._process_unit_info(zdata=(bottom, top))
-        bottom = self._validate_converted_limits(bottom, self.convert_zunits)
-        top = self._validate_converted_limits(top, self.convert_zunits)
+        bottom = self.convert_zunits(bottom)
+        top = self.convert_zunits(top)
+        self._validate_converted_limits(bottom)
+        self._validate_converted_limits(top)
 
         old_bottom, old_top = self.get_zlim()
         if bottom is None:
