Merge pull request #8647 from tacaswell/fix_invalid_figsize

QuLogic · web-flow · commit 62e80840ab20 · 2017-05-23T00:12:42.000-04:00
FIX: fail early for non-finite figure sizes
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -79,8 +79,8 @@ def __setitem__(self, key, value):
         super(_ColorMapping, self).__setitem__(key, value)
         self.cache.clear()
 
-    def __delitem__(self, key, value):
-        super(_ColorMapping, self).__delitem__(key, value)
+    def __delitem__(self, key):
+        super(_ColorMapping, self).__delitem__(key)
         self.cache.clear()
 
 
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -324,7 +324,11 @@ def __init__(self,
         if frameon is None:
             frameon = rcParams['figure.frameon']
 
+        if not np.isfinite(figsize).all():
+            raise ValueError('figure size must be finite not '
+                             '{}'.format(figsize))
         self.bbox_inches = Bbox.from_bounds(0, 0, *figsize)
+
         self.dpi_scale_trans = Affine2D().scale(dpi, dpi)
         # do not use property as it will trigger
         self._dpi = dpi
@@ -710,7 +714,9 @@ def set_size_inches(self, w, h=None, forward=True):
         # argument, so unpack them
         if h is None:
             w, h = w
-
+        if not all(np.isfinite(_) for _ in (w, h)):
+            raise ValueError('figure size must be finite not '
+                             '({}, {})'.format(w, h))
         dpival = self.dpi
         self.bbox_inches.p1 = w, h
 
@@ -920,6 +926,9 @@ def add_axes(self, *args, **kwargs):
                 raise ValueError(msg)
         else:
             rect = args[0]
+            if not np.isfinite(rect).all():
+                raise ValueError('all entries in rect must be finite '
+                                 'not {}'.format(rect))
             projection_class, kwargs, key = process_projection_requirements(
                 self, *args, **kwargs)
 
diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py
@@ -286,3 +286,15 @@ def test_change_dpi():
     fig.canvas.draw()
     assert fig.canvas.renderer.height == 200
     assert fig.canvas.renderer.width == 200
+
+
+def test_invalid_figure_size():
+    with pytest.raises(ValueError):
+        plt.figure(figsize=(1, np.nan))
+
+    fig = plt.figure()
+    with pytest.raises(ValueError):
+        fig.set_size_inches(1, np.nan)
+
+    with pytest.raises(ValueError):
+        fig.add_axes((.1, .1, .5, np.nan))
