Merge pull request #16622 from meeseeksmachine/auto-backport-of-pr-16613-on-v3.2.x

timhoffm · web-flow · commit 6f21e75fc11e · 2020-03-02T00:04:12.000+01:00
Backport PR #16613 on branch v3.2.x (Fix edge-case in preprocess_data, if label_namer is optional and unset.)
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -1543,9 +1543,6 @@ def inner(ax, *args, data=None, **kwargs):
             return func(ax, *map(sanitize_sequence, args), **kwargs)
 
         bound = new_sig.bind(ax, *args, **kwargs)
-        needs_label = (label_namer
-                       and "label" not in bound.arguments
-                       and "label" not in bound.kwargs)
         auto_label = (bound.arguments.get(label_namer)
                       or bound.kwargs.get(label_namer))
 
@@ -1564,12 +1561,10 @@ def inner(ax, *args, data=None, **kwargs):
         new_args = bound.args
         new_kwargs = bound.kwargs
 
-        if needs_label:
-            all_kwargs = {**bound.arguments, **bound.kwargs}
-            # label_namer will be in all_kwargs as we asserted above that
-            # `label_namer is None or label_namer in arg_names`.
+        args_and_kwargs = {**bound.arguments, **bound.kwargs}
+        if label_namer and "label" not in args_and_kwargs:
             new_kwargs["label"] = _label_from_arg(
-                all_kwargs[label_namer], auto_label)
+                args_and_kwargs.get(label_namer), auto_label)
 
         return func(*new_args, **new_kwargs)
 
