Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix edge-case in preprocess_data, if label_namer is optional and unset. #16613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 1, 2020
Merged

Fix edge-case in preprocess_data, if label_namer is optional and unset. #16613

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e445831
Fix edge-case in preprocess_data, if label_namer is optional and unset.
anntzer Mar 1, 2020
daceb69
Further simplify _preprocess_data.
anntzer Mar 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions lib/matplotlib/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1382,9 +1382,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))

Expand All @@ -1403,12 +1400,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)

Expand Down