fix some test failures

efiring · efiring · commit 4ab8e14a3182 · 2016-08-05T10:41:22.000-10:00
diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
@@ -685,6 +685,12 @@ def get_edgecolor(self):
     get_edgecolors = get_edgecolor
 
     def _set_edgecolor(self, c):
+        if c is None:
+            if (mpl.rcParams['patch.force_edgecolor'] or
+                    not self._is_filled or self._edge_default):
+                c = mpl.rcParams['patch.edgecolor']
+            else:
+                c = 'none'
         self._is_stroked = True
         try:
             if c.lower() == 'none':
@@ -715,12 +721,6 @@ def set_edgecolor(self, c):
         ACCEPTS: matplotlib color spec or sequence of specs
         """
         self._original_edgecolor = c
-        if c is None:
-            if (mpl.rcParams['patch.force_edgecolor'] or
-                    not self._is_filled or self._edge_default):
-                c = mpl.rcParams['patch.edgecolor']
-            else:
-                c = 'none'
         self._set_edgecolor(c)
 
     def set_edgecolors(self, c):
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
@@ -304,12 +304,13 @@ def set_edgecolor(self, color):
         self._original_edgecolor = color
         self._set_edgecolor(color)
 
-
     def set_ec(self, color):
         """alias for set_edgecolor"""
         return self.set_edgecolor(color)
 
     def _set_facecolor(self, color):
+        if color is None:
+            color = mpl.rcParams['patch.facecolor']
         alpha = self._alpha if self._fill else 0
         self._facecolor = colors.to_rgba(color, alpha)
         self.stale = True
@@ -320,9 +321,7 @@ def set_facecolor(self, color):
 
         ACCEPTS: mpl color spec, or None for default, or 'none' for no color
         """
-        self._original_facecolor = color  # Not strictly needed now.
-        if color is None:
-            color = mpl.rcParams['patch.facecolor']
+        self._original_facecolor = color
         self._set_facecolor(color)
 
     def set_fc(self, color):
@@ -359,7 +358,6 @@ def set_alpha(self, alpha):
         self._set_edgecolor(self._original_edgecolor)
         # stale is already True
 
-
     def set_linewidth(self, w):
         """
         Set the patch linewidth in points
@@ -435,7 +433,7 @@ def set_fill(self, b):
         ACCEPTS: [True | False]
         """
         self._fill = bool(b)
-        self._set_facecolor(self._facecolor)
+        self._set_facecolor(self._original_facecolor)
         self._set_edgecolor(self._original_edgecolor)
         self.stale = True
 
