changed function name and docstring, fixed set_ylim3d()

Vedant Nanda · Vedant Nanda · commit f374d0840ae5 · 2017-04-14T20:41:38.000+05:30
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -2810,9 +2810,15 @@ def get_xlim(self):
         """
         return tuple(self.viewLim.intervalx)
 
-    def _validate_axis_limits(self, limit, convert):
+    def _validate_converted_limits(self, limit, convert):
         """
-        Raise ValueError if specified axis limits are infinite.
+        Raise ValueError if converted limits are non-finite.
+
+        Note that this functions also accepts None as a limit argument.
+
+        Returns
+        -------
+        The limit value after call to convert(), or None if limit is None.
 
         """
         if limit is not None:
@@ -2889,8 +2895,8 @@ def set_xlim(self, left=None, right=None, emit=True, auto=False, **kw):
             left, right = left
 
         self._process_unit_info(xdata=(left, right))
-        left = self._validate_axis_limits(left, self.convert_xunits)
-        right = self._validate_axis_limits(right, self.convert_xunits)
+        left = self._validate_converted_limits(left, self.convert_xunits)
+        right = self._validate_converted_limits(right, self.convert_xunits)
 
         old_left, old_right = self.get_xlim()
         if left is None:
@@ -3181,8 +3187,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_axis_limits(bottom, self.convert_yunits)
-        top = self._validate_axis_limits(top, self.convert_yunits)
+        bottom = self._validate_converted_limits(bottom, self.convert_yunits)
+        top = self._validate_converted_limits(top, self.convert_yunits)
 
         old_bottom, old_top = self.get_ylim()
 
diff --git a/lib/mpl_toolkits/mplot3d/axes3d.py b/lib/mpl_toolkits/mplot3d/axes3d.py
@@ -605,8 +605,8 @@ def set_xlim3d(self, left=None, right=None, emit=True, auto=False, **kw):
             left, right = left
 
         self._process_unit_info(xdata=(left, right))
-        left = self._validate_axis_limits(left, self.convert_xunits)
-        right = self._validate_axis_limits(right, self.convert_xunits)
+        left = self._validate_converted_limits(left, self.convert_xunits)
+        right = self._validate_converted_limits(right, self.convert_xunits)
 
         old_left, old_right = self.get_xlim()
         if left is None:
@@ -657,14 +657,14 @@ def set_ylim3d(self, bottom=None, top=None, emit=True, auto=False, **kw):
             bottom, top = bottom
 
         self._process_unit_info(ydata=(bottom, top))
-        if bottom is not None:
-            bottom = self.convert_yunits(bottom)
-        if top is not None:
-            top = self.convert_yunits(top)
+        bottom = self._validate_converted_limits(bottom, self.convert_yunits)
+        top = self._validate_converted_limits(top, self.convert_yunits)
 
         old_bottom, old_top = self.get_ylim()
-        bottom = self._validate_axis_limits(bottom, self.convert_yunits)
-        top = self._validate_axis_limits(top, self.convert_yunits)
+        if bottom is None:
+            bottom = old_bottom
+        if top is None:
+            top = old_top
 
         if top == bottom:
             warnings.warn(('Attempting to set identical bottom==top results\n'
@@ -709,8 +709,8 @@ 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_axis_limits(bottom, self.convert_yunits)
-        top = self._validate_axis_limits(top, self.convert_yunits)
+        bottom = self._validate_converted_limits(bottom, self.convert_yunits)
+        top = self._validate_converted_limits(top, self.convert_yunits)
 
         old_bottom, old_top = self.get_zlim()
         if bottom is None:
