removed \, and moved error check after convert unit

Alix Lian · Alix Lian · commit 85fac95e7223 · 2017-03-07T01:04:20.000-05:00
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -2874,14 +2874,14 @@ def set_xlim(self, left=None, right=None, emit=True, auto=False, **kw):
 
         self._process_unit_info(xdata=(left, right))
 
-        if ((np.isscalar(left)) and not (np.isfinite(left))) \
-                or ((np.isscalar(right)) and (not np.isfinite(right))):
-            raise ValueError('left/right should be finite values')
-
         if left is not None:
             left = self.convert_xunits(left)
+            if ((np.isscalar(left)) and not (np.isfinite(left))):
+                raise ValueError('left/right should be finite values')
         if right is not None:
             right = self.convert_xunits(right)
+            if ((np.isscalar(right)) and (not np.isfinite(right))):
+                raise ValueError('left/right should be finite values')
 
         old_left, old_right = self.get_xlim()
         if left is None:
@@ -3172,14 +3172,14 @@ def set_ylim(self, bottom=None, top=None, emit=True, auto=False, **kw):
         if top is None and iterable(bottom):
             bottom, top = bottom
 
-        if ((np.isscalar(top)) and not (np.isfinite(top))) \
-                or ((np.isscalar(bottom)) and (not np.isfinite(bottom))):
-            raise ValueError('top/bottom should be finite values')
-
         if bottom is not None:
             bottom = self.convert_yunits(bottom)
+            if ((np.isscalar(bottom)) and not (np.isfinite(bottom))):
+                raise ValueError('top/bottom should be finite values')
         if top is not None:
             top = self.convert_yunits(top)
+            if ((np.isscalar(top)) and (not np.isfinite(top))):
+                raise ValueError('top/bottom should be finite values')
 
         old_bottom, old_top = self.get_ylim()
 
diff --git a/lib/mpl_toolkits/mplot3d/axes3d.py b/lib/mpl_toolkits/mplot3d/axes3d.py
@@ -602,15 +602,15 @@ def set_xlim3d(self, left=None, right=None, emit=True, auto=False, **kw):
         if right is None and cbook.iterable(left):
             left, right = left
 
-        if ((np.isscalar(left)) and not (np.isfinite(left))) \
-                or ((np.isscalar(right)) and (not np.isfinite(right))):
-            raise ValueError('left/right should be finite values')
-
         self._process_unit_info(xdata=(left, right))
         if left is not None:
             left = self.convert_xunits(left)
+            if ((np.isscalar(left)) and not (np.isfinite(left))):
+                raise ValueError('left/right should be finite values')
         if right is not None:
             right = self.convert_xunits(right)
+            if ((np.isscalar(right)) and (not np.isfinite(right))):
+                raise ValueError('left/right should be finite values')
 
         old_left, old_right = self.get_xlim()
         if left is None:
@@ -660,15 +660,15 @@ def set_ylim3d(self, bottom=None, top=None, emit=True, auto=False, **kw):
         if top is None and cbook.iterable(bottom):
             bottom, top = bottom
 
-        if ((np.isscalar(top)) and not (np.isfinite(top))) \
-                or ((np.isscalar(bottom)) and (not np.isfinite(bottom))):
-            raise ValueError('top/bottom should be finite values')
-
         self._process_unit_info(ydata=(bottom, top))
         if bottom is not None:
             bottom = self.convert_yunits(bottom)
+            if ((np.isscalar(bottom)) and not (np.isfinite(bottom))):
+                raise ValueError('bottom should be finite values')
         if top is not None:
             top = self.convert_yunits(top)
+            if ((np.isscalar(top)) and (not np.isfinite(top))):
+                raise ValueError('top should be finite values')
 
         old_bottom, old_top = self.get_ylim()
         if bottom is None:
@@ -720,14 +720,14 @@ def set_zlim3d(self, bottom=None, top=None, emit=True, auto=False, **kw):
 
         self._process_unit_info(zdata=(bottom, top))
 
-        if ((np.isscalar(top)) and not (np.isfinite(top))) \
-                or ((np.isscalar(bottom)) and (not np.isfinite(bottom))):
-            raise ValueError('top/bottom should be finite values')
-
         if bottom is not None:
             bottom = self.convert_zunits(bottom)
+            if ((np.isscalar(bottom)) and not (np.isfinite(bottom))):
+                raise ValueError('bottom should be finite values')
         if top is not None:
             top = self.convert_zunits(top)
+            if ((np.isscalar(top)) and (not np.isfinite(top))):
+                raise ValueError('top should be finite values')
 
         old_bottom, old_top = self.get_zlim()
         if bottom is None:
