Don't normalize color string during coercion

We still make strings lowercase and remove spaces during validation,
but now we store the original string internally

Author: Jon M. Mease

_plotly_utils/basevalidators.py

@@ -924,17 +924,16 @@ def perform_validate_coerce(v, allow_number=None):
             return None
         else:
             # Remove spaces so regexes don't need to bother with them.
-            v = v.replace(' ', '')
-            v = v.lower()
+            v_normalized = v.replace(' ', '').lower()
 
-            if ColorValidator.re_hex.fullmatch(v):
+            if ColorValidator.re_hex.fullmatch(v_normalized):
                 # valid hex color (e.g. #f34ab3)
                 return v
-            elif ColorValidator.re_rgb_etc.fullmatch(v):
+            elif ColorValidator.re_rgb_etc.fullmatch(v_normalized):
                 # Valid rgb(a), hsl(a), hsv(a) color
                 # (e.g. rgba(10, 234, 200, 50%)
                 return v
-            elif v in ColorValidator.named_colors:
+            elif v_normalized in ColorValidator.named_colors:
                 # Valid named color (e.g. 'coral')
                 return v
             else:

_plotly_utils/tests/validators/test_color_validator.py

@@ -31,10 +31,7 @@ def validator_aok_colorscale():
                          ['red', 'BLUE', 'rgb(255, 0, 0)', 'hsl(0, 100%, 50%)', 'hsla(0, 100%, 50%, 100%)',
                           'hsv(0, 100%, 100%)', 'hsva(0, 100%, 100%, 50%)'])
 def test_acceptance(val, validator: ColorValidator):
-    if isinstance(val, str):
-        assert validator.validate_coerce(val) == str.replace(val.lower(), ' ', '')
-    else:
-        assert validator.validate_coerce(val) == val
+    assert validator.validate_coerce(val) == val
 
 
 # ### Rejection by type ###
@@ -64,10 +61,7 @@ def test_rejection(val, validator: ColorValidator):
                          ['red', 'BLUE', 23, 15, 'rgb(255, 0, 0)', 'hsl(0, 100%, 50%)', 'hsla(0, 100%, 50%, 100%)',
                           'hsv(0, 100%, 100%)', 'hsva(0, 100%, 100%, 50%)'])
 def test_acceptance_colorscale(val, validator_colorscale: ColorValidator):
-    if isinstance(val, str):
-        assert validator_colorscale.validate_coerce(val) == str.replace(val.lower(), ' ', '')
-    else:
-        assert validator_colorscale.validate_coerce(val) == val
+    assert validator_colorscale.validate_coerce(val) == val
 
 
 # ### Rejection by type ###
@@ -100,14 +94,11 @@ def test_rejection_colorscale(val, validator_colorscale: ColorValidator):
                           ['hsva(0, 100%, 100%, 50%)']])
 def test_acceptance_aok(val, validator_aok: ColorValidator):
     coerce_val = validator_aok.validate_coerce(val)
+
     if isinstance(val, (list, np.ndarray)):
-        expected = np.array(
-            [str.replace(v.lower(), ' ', '') if isinstance(v, str) else v for v in val],
-            dtype=coerce_val.dtype)
-        assert np.array_equal(coerce_val, expected)
+        assert np.array_equal(coerce_val, val)
     else:
-        expected = str.replace(val.lower(), ' ', '') if isinstance(val, str) else val
-        assert coerce_val == expected
+        assert coerce_val == val
 
 
 # ### Rejection ###
@@ -134,13 +125,9 @@ def test_rejection_aok(val, validator_aok: ColorValidator):
 def test_acceptance_aok_colorscale(val, validator_aok_colorscale: ColorValidator):
     coerce_val = validator_aok_colorscale.validate_coerce(val)
     if isinstance(val, (list, np.ndarray)):
-        expected = np.array(
-            [str.replace(v.lower(), ' ', '') if isinstance(v, str) else v for v in val],
-            dtype=coerce_val.dtype)
-        assert np.array_equal(coerce_val, expected)
+        assert np.array_equal(list(coerce_val), val)
     else:
-        expected = str.replace(val.lower(), ' ', '') if isinstance(val, str) else val
-        assert coerce_val == expected
+        assert coerce_val == val
 
 
 # ### Rejection ###

_plotly_utils/tests/validators/test_colorscale_validator.py

@@ -55,7 +55,7 @@ def test_coercion_named(named_colorscale, validator: ColorscaleValidator):
 ])
 def test_acceptance_array(val, validator: ColorscaleValidator):
     # Compute expected (tuple of tuples where color is lowercase with no spaces)
-    expected = tuple([tuple([e[0], str.replace(e[1].lower(), ' ', '')]) for e in val])
+    expected = tuple([tuple([e[0], e[1]]) for e in val])
     assert validator.validate_coerce(val) == expected