Merge pull request #14400 from timhoffm/fix-to-rgba-array-empty

dstansby · web-flow · commit 152b6ff76f94 · 2019-06-01T11:39:07.000+01:00
Fix to_rgba_array() for empty input
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -311,10 +311,12 @@ def to_rgba_array(c, alpha=None):
             cbook.warn_deprecated("3.2", message="Using a string of single "
                                   "character colors as a color sequence is "
                                   "deprecated. Use an explicit list instead.")
-    else:
-        result = np.array([to_rgba(cc, alpha) for cc in c])
+            return result
 
-    return result
+    if len(c) == 0:
+        return np.zeros((0, 4), float)
+    else:
+        return np.array([to_rgba(cc, alpha) for cc in c])
 
 
 def to_rgb(c):
diff --git a/lib/matplotlib/tests/test_colors.py b/lib/matplotlib/tests/test_colors.py
@@ -806,6 +806,7 @@ def test_cn():
 def test_conversions():
     # to_rgba_array("none") returns a (0, 4) array.
     assert_array_equal(mcolors.to_rgba_array("none"), np.zeros((0, 4)))
+    assert_array_equal(mcolors.to_rgba_array([]), np.zeros((0, 4)))
     # a list of grayscale levels, not a single color.
     assert_array_equal(
         mcolors.to_rgba_array([".2", ".5", ".8"]),
