fix error and from file

story645 · story645 · commit 09141e98cadd · 2023-10-15T17:18:13.000-04:00
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -14,6 +14,7 @@
 """
 
 import ast
+from collections.abc import Iterable
 from functools import lru_cache, reduce
 from numbers import Real
 import operator
@@ -97,10 +98,6 @@ def f(s):
                     val = [scalar_validator(v.strip()) for v in s if v.strip()]
                 else:
                     raise
-        elif isinstance(s, dict):
-            # assume dict is a value in the iterator and not the iterator
-            # since iterating over dict only iterates over keys
-            val = [scalar_validator(s)]
         # Allow any ordered sequence type -- generators, np.ndarray, pd.Series
         # -- but not sets, whose iteration order is non-deterministic.
         elif np.iterable(s) and not isinstance(s, (set, frozenset)):
@@ -129,7 +126,6 @@ def f(s):
 
 def validate_any(s):
     return s
-
 validate_anylist = _listify_validator(validate_any)
 
 
@@ -574,11 +570,13 @@ def validate_path_effects(s):
     if not s:
         return []
 
-    if isinstance(s, str) and s.startswith("("):
+    if isinstance(s, str) and s.strip().startswith("("):
         s = ast.literal_eval(s)
-
-    if not isinstance(s, list): #string tuple list mostly
-        s = [s]
+        s = [s] if isinstance(s[0], str) else s # cast to list for the 1 tuple case
+    elif isinstance(s, Iterable):
+        pass #validate list elements in the for loop to allow for mixed list
+    else:
+        ValueError("Expected a list of patheffects functions or (funcname, {**kwargs}) tuples")
 
     _validate_name = ValidateInStrings("path.effects",
                                         ["Normal",
@@ -590,20 +588,19 @@ def validate_path_effects(s):
                                          "withSimplePatchShadow",
                                          "withStroke",
                                          "withTickedStroke"])
+
+
     path_effects = []
 
     for pe in s:
         #patheffects objects
-        if getattr(pe, '__module__', "") == 'matplotlib.patheffects':
+        if isinstance(pe, tuple):
+            path_effects.append((_validate_name(pe[0]),
+                                  {} if len(pe)<2 else pe[1]))
+        elif getattr(pe, '__module__', "") == 'matplotlib.patheffects':
             path_effects.append(pe)
-            continue
-
-        if not isinstance(pe, (tuple)):
-            raise ValueError("Expected a list of tuples of the form: ('function name', {**kwargs})")
-
-        if len(pe) == 1:
-            pe == (pe[0], {})
-        path_effects.append((_validate_name(pe[0]), pe[1]))
+        else:
+            raise ValueError(f'Invalid entry for path.effects: {pe}')
 
 
     return path_effects
