Merge pull request #17544 from timhoffm/plot-fillstyle-none

efiring · web-flow · commit 81e27d412f26 · 2020-06-05T08:52:49.000-10:00
markerfacecolor should not override fillstyle='none' in plot()
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -936,12 +936,11 @@ def get_markeredgewidth(self):
         return self._markeredgewidth
 
     def _get_markerfacecolor(self, alt=False):
+        if self.get_fillstyle() == 'none':
+            return 'none'
         fc = self._markerfacecoloralt if alt else self._markerfacecolor
         if cbook._str_lower_equal(fc, 'auto'):
-            if self.get_fillstyle() == 'none':
-                return 'none'
-            else:
-                return self._color
+            return self._color
         else:
             return fc
 
diff --git a/lib/matplotlib/tests/test_lines.py b/lib/matplotlib/tests/test_lines.py
@@ -183,6 +183,14 @@ def test_marker_fill_styles():
     ax.set_xlim([-5, 155])
 
 
+def test_markerfacecolor_fillstyle():
+    """Test that markerfacecolor does not override fillstyle='none'."""
+    l, = plt.plot([1, 3, 2], marker=MarkerStyle('o', fillstyle='none'),
+                  markerfacecolor='red')
+    assert l.get_fillstyle() == 'none'
+    assert l.get_markerfacecolor() == 'none'
+
+
 @image_comparison(['scaled_lines'], style='default')
 def test_lw_scaling():
     th = np.linspace(0, 32)
