10000 Tiny cleanups to set_xlabel(..., loc=...). by anntzer · Pull Request #16274 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]
Skip to content

Tiny cleanups to set_xlabel(..., loc=...). #16274

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 1 commit into from
Jan 21, 2020
Merged

Tiny cleanups to set_xlabel(..., loc=...). #16274

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 18 additions & 22 deletions lib/matplotlib/axes/_axes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,22 +217,20 @@ def set_xlabel(self, xlabel, fontdict=None, labelpad=None, *,
"""
if labelpad is not None:
self.xaxis.labelpad = labelpad
_protected_kw = ['x', 'horizontalalignment', 'ha']
if any([k in kwargs for k in _protected_kw]):
protected_kw = ['x', 'horizontalalignment', 'ha']
if {*kwargs} & {*protected_kw}:
if loc is not None:
raise TypeError('Specifying *loc* is disallowed when any of '
'its corresponding low level kwargs {} '
'are supplied as well.'.format(_protected_kw))
raise TypeError(f"Specifying 'loc' is disallowed when any of "
f"its corresponding low level kwargs "
f"({protected_kw}) are supplied as well")
loc = 'center'
else:
loc = loc if loc is not None else rcParams['xaxis.labellocation']
cbook._check_in_list(('left', 'center', 'right'), loc=loc)
if loc == 'right':
kwargs['x'] = 1.
kwargs['horizontalalignment'] = 'right'
elif loc == 'left':
kwargs['x'] = 0.
kwargs['horizontalalignment'] = 'left'
if loc == 'left':
kwargs.update(x=0, horizontalalignment='left')
elif loc == 'right':
kwargs.update(x=1, horizontalalignment='right')
return self.xaxis.set_label_text(xlabel, fontdict, **kwargs)

def get_ylabel(self):
Expand Down Expand Up @@ -272,22 +270,20 @@ def set_ylabel(self, ylabel, fontdict=None, labelpad=None, *,
"""
if labelpad is not None:
self.yaxis.labelpad = labelpad
_protected_kw = ['y', 'horizontalalignment', 'ha']
if any([k in kwargs for k in _protected_kw]):
protected_kw = ['y', 'horizontalalignment', 'ha']
if {*kwargs} & {*protected_kw}:
if loc is not None:
raise TypeError('Specifying *loc* is disallowed when any of '
'its corresponding low level kwargs {} '
'are supplied as well.'.format(_protected_kw))
raise TypeError(f"Specifying 'loc' is disallowed when any of "
f"its corresponding low level kwargs "
f"({protected_kw}) are supplied as well")
loc = 'center'
else:
loc = loc if loc is not None else rcParams['yaxis.labellocation']
cbook._check_in_list(('bottom', 'center', 'top'), loc=loc)
if loc == 'top':
kwargs['y'] = 1.
kwargs['horizontalalignment'] = 'right'
elif loc == 'bottom':
kwargs['y'] = 0.
kwargs['horizontalalignment'] = 'left'
if loc == 'bottom':
kwargs.update(y=0, horizontalalignment='left')
elif loc == 'top':
kwargs.update(y=1, horizontalalignment='right')
return self.yaxis.set_label_text(ylabel, fontdict, **kwargs)

def get_legend_handles_labels(self, legend_handler_map=None):
Expand Down
0