parametrized tests and cleaner calls to validate

Vedant Nanda · Vedant Nanda · commit 187f5da60767 · 2017-04-13T01:46:03.000+05:30
diff --git a/lib/mpl_toolkits/mplot3d/axes3d.py b/lib/mpl_toolkits/mplot3d/axes3d.py
@@ -589,16 +589,15 @@ def _determine_lims(self, xmin=None, xmax=None, *args, **kwargs):
 
     def _validate_axis_limits(self, limit, convert):
         """
-        If the axis limits being set are infinite, this function
-
-        raises an error.
+        Raise ValueError if specified axis limits are infinite.
 
         """
         if limit is not None:
+            converted_limits = convert(limit)
             if (isinstance(limit, float) and
                     (not np.isreal(limit) or not np.isfinite(limit))):
-                raise ValueError("NaN or Inf cannot be the argument values")
-            return convert(limit)
+                raise ValueError("Axis limits cannot be NaN or Inf")
+            return converted_limits
 
     def set_xlim3d(self, left=None, right=None, emit=True, auto=False, **kw):
         """
diff --git a/lib/mpl_toolkits/tests/test_mplot3d.py b/lib/mpl_toolkits/tests/test_mplot3d.py
@@ -560,7 +560,7 @@ def test_axes3d_ortho():
 ])
 def test_invalid_axes_limits(setter, side, value):
     limit = {side: value}
+    fig = plt.figure()
+    obj = fig.add_subplot(111, projection='3d')
     with pytest.raises(ValueError):
-        fig = plt.figure()
-        obj = fig.add_subplot(111, projection='3d')
         getattr(obj, setter)(**limit)
