Merge branch 'v2.x'

efiring · efiring · commit 5d1cd3cf0c6e · 2016-11-23T15:24:57.000-10:00
diff --git a/doc/api/api_changes.rst b/doc/api/api_changes.rst
@@ -155,6 +155,15 @@ where "ax" is an ``Axes3d`` object created with something like ::
    ax = plt.sublot(111, projection='3d')
 
 
+Stale figure behavior
+---------------------
+
+Attempting to draw the figure will now mark it as not stale (independent if
+the draw succeeds).  This change is to prevent repeatedly trying to re-draw a
+figure which is raising an error on draw.  The previous behavior would only mark
+a figure as not stale after a full re-draw succeeded.
+
+
 Changes in 1.5.3
 ================
 
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -1216,19 +1216,6 @@ def draw(self, renderer):
         if not self.get_visible():
             return
 
-        renderer.open_group('figure')
-        # prevent triggering call backs during the draw process
-        self._stale = True
-        if self.get_tight_layout() and self.axes:
-            try:
-                self.tight_layout(renderer, **self._tight_parameters)
-            except ValueError:
-                pass
-                # ValueError can occur when resizing a window.
-
-        if self.frameon:
-            self.patch.draw(renderer)
-
         # a list of (zorder, func_to_call, list_of_args)
         dsu = []
 
@@ -1258,11 +1245,24 @@ def draw(self, renderer):
         dsu = [row for row in dsu if not row[1].get_animated()]
         dsu.sort(key=itemgetter(0))
 
-        mimage._draw_list_compositing_images(
-            renderer, self, dsu, self.suppressComposite)
+        try:
+            renderer.open_group('figure')
+            if self.get_tight_layout() and self.axes:
+                try:
+                    self.tight_layout(renderer, **self._tight_parameters)
+                except ValueError:
+                    pass
+                    # ValueError can occur when resizing a window.
+
+            if self.frameon:
+                self.patch.draw(renderer)
+
+            mimage._draw_list_compositing_images(
+                renderer, self, dsu, self.suppressComposite)
 
-        renderer.close_group('figure')
-        self.stale = False
+            renderer.close_group('figure')
+        finally:
+            self.stale = False
 
         self._cachedRenderer = renderer
         self.canvas.draw_event(renderer)
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
@@ -356,7 +356,7 @@ def set_alpha(self, alpha):
             except TypeError:
                 raise TypeError('alpha must be a float or None')
         artist.Artist.set_alpha(self, alpha)
-        self._set_facecolor(self._facecolor)
+        self._set_facecolor(self._original_facecolor)
         self._set_edgecolor(self._original_edgecolor)
         # stale is already True
 
diff --git a/lib/matplotlib/tests/test_patches.py b/lib/matplotlib/tests/test_patches.py
@@ -176,6 +176,14 @@ def test_patch_alpha_override():
     ax.set_ylim([-1, 2])
 
 
+@cleanup(style='default')
+def test_patch_color_none():
+    # Make sure the alpha kwarg does not override 'none' facecolor.
+    # Addresses issue #7478.
+    c = plt.Circle((0, 0), 1, facecolor='none', alpha=1)
+    assert c.get_facecolor()[0] == 0
+
+
 @image_comparison(baseline_images=['patch_custom_linestyle'],
                   remove_text=True)
 def test_patch_custom_linestyle():
