Restore Collection.get_fill(); add more test cases

efiring · efiring · commit e4594ac1714d · 2020-09-15T09:03:04.000-10:00
diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
@@ -922,10 +922,11 @@ def update_scalarmappable(self):
             self._set_edgecolor(self._original_edgecolor)
         self.stale = True
 
-    @cbook.deprecated("3.4")
     def get_fill(self):
-        """Return whether facecolor is currently mapped."""
-        return self._face_is_mapped
+        """Return whether face is colored."""
+        fill = not (isinstance(self._original_facecolor, str)
+                    and self._original_facecolor == "none")
+        return fill
 
     def update_from(self, other):
         """Copy properties from other to self."""
diff --git a/lib/matplotlib/legend_handler.py b/lib/matplotlib/legend_handler.py
@@ -707,10 +707,8 @@ def get_first(prop_array):
         legend_handle.set_edgecolor(first_color(edgecolor))
         facecolor = getattr(orig_handle, '_original_facecolor',
                             orig_handle.get_facecolor())
-        fillcolor = first_color(facecolor)
-        legend_handle.set_facecolor(fillcolor)
-        fill = not (isinstance(fillcolor, str) and fillcolor == "none")
-        legend_handle.set_fill(fill)
+        legend_handle.set_facecolor(first_color(facecolor))
+        legend_handle.set_fill(orig_handle.get_fill())
         legend_handle.set_hatch(orig_handle.get_hatch())
         legend_handle.set_linewidth(get_first(orig_handle.get_linewidths()))
         legend_handle.set_linestyle(get_first(orig_handle.get_linestyles()))
diff --git a/lib/matplotlib/tests/test_collections.py b/lib/matplotlib/tests/test_collections.py
@@ -781,6 +781,14 @@ def test_color_logic(pcfunc):
     pc = pcfunc(z, edgecolors=(1, 0, 0), facecolors=(0, 1, 0))
     assert_array_equal(pc.get_facecolor(), [[0, 1, 0, 1]])
     assert_array_equal(pc.get_edgecolor(), [[1, 0, 0, 1]])
+    # Provide an RGB array.
+    pc = pcfunc(z, edgecolors=(1, 0, 0), facecolors=np.ones((12, 3)))
+    assert_array_equal(pc.get_facecolor(), np.ones((12, 4)))
+    assert_array_equal(pc.get_edgecolor(), [[1, 0, 0, 1]])
+    # And an RGBA array.
+    pc = pcfunc(z, edgecolors=(1, 0, 0), facecolors=np.ones((12, 4)))
+    assert_array_equal(pc.get_facecolor(), np.ones((12, 4)))
+    assert_array_equal(pc.get_edgecolor(), [[1, 0, 0, 1]])
 
 
 def test_array_wrong_dimensions():
