Recursively eval cycler kwargs

scottshambaugh · ksunden · commit 69a631bca607 · 2026-04-21T17:48:39.000-05:00
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -795,7 +795,7 @@ def _eval_cycler_expr(node):
                 "only the 'cycler()' and 'concat()' functions are allowed")
         func = cycler if node.func.id == 'cycler' else cconcat
         args = [_eval_cycler_expr(a) for a in node.args]
-        kwargs = {kw.arg: ast.literal_eval(kw.value) for kw in node.keywords}
+        kwargs = {kw.arg: _eval_cycler_expr(kw.value) for kw in node.keywords}
         return func(*args, **kwargs)
     if isinstance(node, ast.Subscript):
         sl = node.slice
diff --git a/lib/matplotlib/tests/test_rcparams.py b/lib/matplotlib/tests/test_rcparams.py
@@ -274,6 +274,8 @@ def generate_validator_testcases(valid):
                       cycler('markeredgewidth', [2, 5])),
                      ("2 * cycler('color', 'rgb')", 2 * cycler('color', 'rgb')),
                      ("2 * cycler('color', 'r' + 'gb')", 2 * cycler('color', 'rgb')),
+                     ("cycler(c='r' + 'gb', lw=[1, 2, 3])",
+                      cycler('color', 'rgb') + cycler('linewidth', [1, 2, 3])),
                      ("cycler('color', 'rgb') * 2", cycler('color', 'rgb') * 2),
                      ("concat(cycler('color', 'rgb'), cycler('color', 'cmk'))",
                       cycler('color', list('rgbcmk'))),
