Change invalid axis limit error to warning

bcongdon · bcongdon · commit e5cc8e101c05 · 2017-01-05T09:19:49.000-05:00
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -2875,17 +2875,16 @@ def set_xlim(self, left=None, right=None, emit=True, auto=False, **kw):
         if right is not None:
             right = self.convert_xunits(right)
 
-        if ((left is not None and not np.isfinite(left)) or
-                (right is not None and not np.isfinite(right))):
-            raise ValueError("xlim limits must be finite. "
-                             "instead, found: (%s, %s)" % (left, right))
-
         old_left, old_right = self.get_xlim()
         if left is None:
             left = old_left
         if right is None:
             right = old_right
 
+        if not (np.isfinite(left) and np.isfinite(right)):
+            warnings.warn('xlim limits must be finite.\n'
+                          'instead, found: (%s, %s)' % (left, right))
+
         if left == right:
             warnings.warn(
                 ('Attempting to set identical left==right results\n'
@@ -3159,18 +3158,17 @@ def set_ylim(self, bottom=None, top=None, emit=True, auto=False, **kw):
         if top is not None:
             top = self.convert_yunits(top)
 
-        if ((top is not None and not np.isfinite(top)) or
-                (bottom is not None and not np.isfinite(bottom))):
-            raise ValueError("ylim limits must be finite. "
-                             "instead, found: (%s, %s)" % (top, bottom))
-
         old_bottom, old_top = self.get_ylim()
 
         if bottom is None:
             bottom = old_bottom
         if top is None:
             top = old_top
 
+        if not (np.isfinite(top) and np.isfinite(bottom)):
+            warnings.warn('ylim limits must be finite.\n'
+                          'instead, found: (%s, %s)' % (top, bottom))
+
         if bottom == top:
             warnings.warn(
                 ('Attempting to set identical bottom==top results\n'
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -4880,13 +4880,12 @@ def test_eventplot_legend():
 
 
 @cleanup
-def test_invalid_axis_limits():
+def test_invalid_axis_warnings():
     plt.plot([0, 1], [0, 1])
-    with pytest.raises(ValueError):
+    with warnings.catch_warnings(record=True) as w:
+        warnings.simplefilter("always")
         plt.xlim(np.nan)
-    with pytest.raises(ValueError):
         plt.xlim(np.inf)
-    with pytest.raises(ValueError):
         plt.ylim(np.nan)
-    with pytest.raises(ValueError):
         plt.ylim(np.inf)
+        assert len(w) == 4
