matplotlib
diff --git a/‎lib/matplotlib/collections.py
Lines changed: 14 additions & 12 deletions b/‎lib/matplotlib/collections.py
Lines changed: 14 additions & 12 deletions
diff --git a/‎lib/matplotlib/tests/test_collections.py
Lines changed: 15 additions & 0 deletions b/‎lib/matplotlib/tests/test_collections.py
Lines changed: 15 additions & 0 deletions
@@ -788,18 +788,17 @@ def get_edgecolor(self):
         else:
             return self._edgecolors
 
-    def _set_edgecolor(self, c, default=None):
+    def _get_default_edgecolor(self):
+        return mpl.rcParams['patch.edgecolor']
+
+    def _set_edgecolor(self, c):
         set_hatch_color = True
         if c is None:
-            if default is None:
-                if (mpl.rcParams['patch.force_edgecolor'] or
-                        not self._face_is_mapped or self._edge_default):
-                    c = mpl.rcParams['patch.edgecolor']
-                else:
-                    c = 'none'
-                    set_hatch_color = False
+            if (mpl.rcParams['patch.force_edgecolor'] or self._edge_default):
+                c = self._get_default_edgecolor()
             else:
-                c = default
+                c = 'none'
+                set_hatch_color = False
         if isinstance(c, str) and c == 'face':
             self._edgecolors = 'face'
             self.stale = True
@@ -809,7 +808,7 @@ def _set_edgecolor(self, c, default=None):
             self._hatch_color = tuple(self._edgecolors[0])
         self.stale = True
 
-    def set_edgecolor(self, c, default=None):
+    def set_edgecolor(self, c):
         """
         Set the edgecolor(s) of the collection.
 
@@ -825,7 +824,7 @@ def set_edgecolor(self, c, default=None):
         if isinstance(c, str) and c.lower() in ("none", "face"):
             c = c.lower()
         self._original_edgecolor = c
-        self._set_edgecolor(c, default=default)
+        self._set_edgecolor(c)
 
     def set_alpha(self, alpha):
         """
@@ -1512,6 +1511,9 @@ def _add_offsets(self, segs):
                 segs[i] = segs[i] + offsets[io:io + 1]
         return segs
 
+    def _get_default_edgecolor(self):
+        return mpl.rcParams['lines.color']
+
     def set_color(self, c):
         """
         Set the color(s) of the LineCollection.
@@ -1523,7 +1525,7 @@ def set_color(self, c):
             sequence of rgba tuples; if it is a sequence the lines will
             cycle through the sequence.
         """
-        self.set_edgecolor(c, default=mpl.rcParams['lines.color'])
+        self.set_edgecolor(c)
 
     def get_color(self):
         return self._edgecolors
 
@@ -777,3 +777,18 @@ def test_color_logic(pcfunc):
     pc.update_scalarmappable()
     assert pc.get_facecolor().shape == (12, 4)  # color-mapped
     assert pc.get_edgecolor().shape == (1, 4)  # not color-mapped
+    # Give color via tuple rather than string.
+    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]])
+
+
+def test_array_wrong_dimensions():
+    z = np.arange(12).reshape(3, 4)
+    pc = plt.pcolor(z)
+    with pytest.raises(ValueError, match="^Collections can only map"):
+        pc.set_array(z)
+        pc.update_scalarmappable()
+    pc = plt.pcolormesh(z)
+    pc.set_array(z)  # 2D is OK for Quadmesh
+    pc.update_scalarmappable()