Skip to content

ENH: plotting methods can unpack labeled data [MOVED TO #4829] #4787

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

Closed
wants to merge 8 commits into from
Closed

ENH: plotting methods can unpack labeled data [MOVED TO #4829] #4787

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1e21903
ENH: plotting methods can unpack labeled data
tacaswell Jul 25, 2015
1cf0f38
ENH: Make implicit x in plot pandas aware
tacaswell Jul 26, 2015
676eeb4
ENH: add white-list of args/kwargs to relpace
tacaswell Jul 26, 2015
9e6e7b4
MNT: remove unused rcparam
tacaswell Jul 26, 2015
5ace465
MNT: python 2.6 does not support set literals
tacaswell Jul 27, 2015
e90d859
ENH: pass at decorator which extracts a label
tacaswell Jul 28, 2015
6646545
FIX: fix typo, slightly rename variables
tacaswell Jul 29, 2015
4059b44
FIX: fix yet more typos
tacaswell Jul 29, 2015
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
Prev Previous commit
Next Next commit
ENH: add white-list of args/kwargs to relpace 
If white list is provided, only try to replace those.
  • Loading branch information
@tacaswell
tacaswell committed Jul 26, 2015
commit 676eeb43c46c5909a3adc7c389dd0077e14f44bb
43 changes: 28 additions & 15 deletions lib/matplotlib/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1528,7 +1528,7 @@ def _replacer(data, key):
return key


def unpack_labeled_data(func):
def unpack_labeled_data(wl_args=None, wl_kwargs=None):
"""
A decorator to add a 'data' kwarg to any a function. The signature
of the input function must be ::
Expand All @@ -1537,20 +1537,33 @@ def foo(ax, *args, **kwargs)

so this is suitable for use with Axes methods.
"""
@functools.wraps(func)
def inner(ax, *args, **kwargs):
data = kwargs.pop('data', None)
if data is not None:
if rcParams['unpack_labeled']:
args = tuple(_replacer(data, a) for a in args)
kwargs = dict((k, _replacer(data, v))
for k, v in six.iteritems(kwargs))
else:
raise ValueError("Trying to unpack labeled data, but "
"rcParams['unpack_labeled'] is False")

return func(ax, *args, **kwargs)
return inner
if wl_kwargs is not None:
wl_kwargs = set(wl_kwargs)
if wl_args is not None:
wl_args = set(wl_args)

def param(func):
@functools.wraps(func)
def inner(ax, *args, **kwargs):
data = kwargs.pop('data', None)
if data is not None:
if wl_args is None:
args = tuple(_replacer(data, a) for a in args)
else:
args = tuple(_replacer(data, a) if j in wl_args else a
for j, a in enumerate(args))

if wl_kwargs is None:
kwargs = dict((k, _replacer(data, v))
for k, v in six.iteritems(kwargs))
else:
kwargs = dict(
(k, _replacer(data, v) if k in wl_kwargs else v)
for k, v in six.iteritems(kwargs))

return func(ax, *args, **kwargs)
return inner
return param

verbose.report('matplotlib version %s' % __version__)
verbose.report('verbose.level %s' % verbose.level)
Expand Down
Loading