adjust validators

Author: archmoj

packages/python/plotly/_plotly_utils/basevalidators.py

@@ -291,6 +291,10 @@ def is_typed_array_spec(v):
     return isinstance(v, dict) and "bdata" in v
 
 
+def is_none_or_typed_array_spec(v):
+    return v is None or is_typed_array_spec(v)
+
+
 def is_simple_array(v):
     """
     Return whether a value is considered to be an simple array
@@ -485,11 +489,7 @@ def description(self):
 
     def validate_coerce(self, v):
 
-        if v is None:
-            # Pass None through
-            pass
-        elif is_typed_array_spec(v):
-            # Pass typed array spec through
+        if is_none_or_typed_array_spec(v):
             pass
         elif is_homogeneous_array(v):
             v = to_typed_array_spec(v)
@@ -686,8 +686,7 @@ def in_values(self, e):
         return False
 
     def validate_coerce(self, v):
-        if v is None:
-            # Pass None through
+        if is_none_or_typed_array_spec(v):
             pass
         elif self.array_ok and is_array(v):
             v_replaced = [self.perform_replacemenet(v_el) for v_el in v]
@@ -847,8 +846,7 @@ def description(self):
         return desc
 
     def validate_coerce(self, v):
-        if v is None:
-            # Pass None through
+        if is_none_or_typed_array_spec(v):
             pass
         elif self.array_ok and is_homogeneous_array(v):
             np = get_module("numpy")
@@ -975,8 +973,7 @@ def description(self):
         return desc
 
     def validate_coerce(self, v):
-        if v is None:
-            # Pass None through
+        if is_none_or_typed_array_spec(v):
             pass
         elif self.array_ok and is_homogeneous_array(v):
             np = get_module("numpy")
@@ -1130,8 +1127,7 @@ def description(self):
         return desc
 
     def validate_coerce(self, v):
-        if v is None:
-            # Pass None through
+        if is_none_or_typed_array_spec(v):
             pass
         elif self.array_ok and is_array(v):
 
@@ -1432,8 +1428,7 @@ def description(self):
         return valid_color_description
 
     def validate_coerce(self, v, should_raise=True):
-        if v is None:
-            # Pass None through
+        if is_none_or_typed_array_spec(v):
             pass
         elif self.array_ok and is_homogeneous_array(v):
             v = copy_to_readonly_numpy_array(v)
@@ -1577,8 +1572,7 @@ def description(self):
 
     def validate_coerce(self, v):
 
-        if v is None:
-            # Pass None through
+        if is_none_or_typed_array_spec(v):
             pass
         elif is_array(v):
             validated_v = [
@@ -1783,8 +1777,7 @@ def description(self):
         return desc
 
     def validate_coerce(self, v):
-        if v is None:
-            # Pass None through
+        if is_none_or_typed_array_spec(v):
             pass
         elif self.array_ok and is_homogeneous_array(v):
             try:
@@ -1972,6 +1965,9 @@ def validate_coerce(self, v):
         if v is None:
             # Pass None through
             pass
+        if is_typed_array_spec(v):
+            # Pass typed array spec through
+            pass
         elif self.array_ok and is_array(v):
 
             # Coerce individual strings
@@ -2028,8 +2024,7 @@ def description(self):
         return desc
 
     def validate_coerce(self, v):
-        if v is None:
-            # Pass None through
+        if is_none_or_typed_array_spec(v):
             pass
         elif self.array_ok and is_homogeneous_array(v):
             v = copy_to_readonly_numpy_array(v, kind="O")
@@ -2237,8 +2232,7 @@ def validate_element_with_indexed_name(self, val, validator, inds):
         return val
 
     def validate_coerce(self, v):
-        if v is None:
-            # Pass None through
+        if is_none_or_typed_array_spec(v):
             return None
         elif not is_array(v):
             self.raise_invalid_val(v)
@@ -2301,7 +2295,7 @@ def validate_coerce(self, v):
         return v
 
     def present(self, v):
-        if v is None:
+        if is_none_or_typed_array_spec(v):
             return None
         else:
             if (