Fix _preprocess_data for Py3.9.

anntzer · anntzer · commit 9728144b3446 · 2020-02-27T15:07:21.000+01:00
On Py3.9 BoundArguments becomes a plain dict, so move_to_end doesn't
exist anymore and the whole thing crashes with an AttributeError.
(Travis currently fails the Py3.9 run.)

As it turns out there's a simpler implementation of the whole thing
anyways, one can just take whatever args/kwargs were explicitly passed
in and, if "label" needs to be added, always add it to kwargs.
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -1399,24 +1399,17 @@ def inner(ax, *args, data=None, **kwargs):
                 if replace_names is None or k in replace_names:
                     bound.arguments[k] = _replacer(data, v)
 
-        bound.apply_defaults()
-        del bound.arguments["data"]
+        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`.
-            label = _label_from_arg(all_kwargs[label_namer], auto_label)
-            if "label" in arg_names:
-                bound.arguments["label"] = label
-                try:
-                    bound.arguments.move_to_end(varkwargs_name)
-                except KeyError:
-                    pass
-            else:
-                bound.arguments.setdefault(varkwargs_name, {})["label"] = label
+            new_kwargs["label"] = _label_from_arg(
+                all_kwargs[label_namer], auto_label)
 
-        return func(*bound.args, **bound.kwargs)
+        return func(*new_args, **new_kwargs)
 
     inner.__doc__ = _add_data_doc(inner.__doc__, replace_names)
     inner.__signature__ = new_sig
