Improves check of arg range

GregoryAshton · GregoryAshton · commit e5700ba7a041 · 2014-05-28T22:07:32.000+01:00
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -349,8 +349,7 @@ 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 float(x) > 1. for x in arg):
                         raise ValueError(
                             'number in rbga sequence outside 0-1 range')
                     if alpha is None:
@@ -360,7 +359,7 @@ def to_rgba(self, arg, alpha=None):
                     return arg[0], arg[1], arg[2], alpha
                 if len(arg) == 3:
                     r, g, b = arg
-                    if [x for x in (r, g, b) if (float(x) < 0) or (x > 1)]:
+                    if any(float(x) < 0. or float(x) > 1. for x in arg):
                         raise ValueError(
                             'number in rbg sequence outside 0-1 range')
                 else:
