Merge pull request #3092 from ga7g08/fix-issue-3079

tacaswell · tacaswell · commit ea8fa7b2197a · 2014-06-02T09:01:43.000-04:00
Adds check that rgb sequence is of length 3
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -349,19 +349,22 @@ def to_rgba(self, arg, alpha=None):
         try:
             if not cbook.is_string_like(arg) and cbook.iterable(arg):
                 if len(arg) == 4:
-                    if [x for x in arg if (float(x) < 0) or (x > 1)]:
-                        # This will raise TypeError if x is not a number.
+                    if any(float(x) < 0 or x > 1 for x in arg):
                         raise ValueError(
                             'number in rbga sequence outside 0-1 range')
                     if alpha is None:
                         return tuple(arg)
                     if alpha < 0.0 or alpha > 1.0:
                         raise ValueError("alpha must be in range 0-1")
                     return arg[0], arg[1], arg[2], alpha
-                r, g, b = arg[:3]
-                if [x for x in (r, g, b) if (float(x) < 0) or (x > 1)]:
+                if len(arg) == 3:
+                    r, g, b = arg
+                    if any(float(x) < 0 or x > 1 for x in arg):
+                        raise ValueError(
+                            'number in rbg sequence outside 0-1 range')
+                else:
                     raise ValueError(
-                        'number in rbg sequence outside 0-1 range')
+                            'length of rgba sequence should be either 3 or 4')
             else:
                 r, g, b = self.to_rgb(arg)
             if alpha is None:
