Skip to content
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

Jump to bottom

Added underscores to Opts attributes #3438

Merged
merged 2 commits into from
Jan 29, 2019
Merged

Added underscores to Opts attributes #3438

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c28858
Added underscore to mode attribute of Opts
jlstevens Jan 28, 2019
ec756c5
Added underscore to obj attribute of Opts
jlstevens Jan 28, 2019
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: 20 additions & 20 deletions holoviews/core/options.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ def __init__(self, message="", warn=True):
class Opts(object):

def __init__(self, obj, mode=None):
self.mode = mode
self.obj = obj
self._mode = mode
self._obj = obj


def __call__(self, *args, **kwargs):
Expand Down Expand Up @@ -106,11 +106,11 @@ def __call__(self, *args, **kwargs):
Returns:
Returns the object or a clone with the options applied
"""
if self.mode is None:
if self._mode is None:
return self._base_opts(*args, **kwargs)
elif self.mode == 'holomap':
elif self._mode == 'holomap':
return self._holomap_opts(*args, **kwargs)
elif self.mode == 'dynamicmap':
elif self._mode == 'dynamicmap':
return self._dynamicmap_opts(*args, **kwargs)

def clear(self, clone=False):
Expand All @@ -122,7 +122,7 @@ def clear(self, clone=False):
Returns:
The object cleared of any options applied to it
"""
return self.obj.opts(clone=clone)
return self._obj.opts(clone=clone)

def info(self, show_defaults=False):
"""Prints a repr of the object including any applied options.
Expand All @@ -131,20 +131,20 @@ def info(self, show_defaults=False):
show_defaults: Whether to include default options
"""
pprinter = PrettyPrinter(show_options=True, show_defaults=show_defaults)
print(pprinter.pprint(self.obj))
print(pprinter.pprint(self._obj))

def _holomap_opts(self, *args, **kwargs):
clone = kwargs.pop('clone', None)
apply_groups, _, _ = deprecated_opts_signature(args, kwargs)
data = OrderedDict([(k, v.opts(*args, **kwargs))
for k, v in self.obj.data.items()])
for k, v in self._obj.data.items()])

# By default do not clone in .opts method
if (apply_groups if clone is None else clone):
return self.obj.clone(data)
return self._obj.clone(data)
else:
self.obj.data = data
return self.obj
self._obj.data = data
return self._obj

def _dynamicmap_opts(self, *args, **kwargs):
from ..util import Dynamic
Expand All @@ -154,16 +154,16 @@ def _dynamicmap_opts(self, *args, **kwargs):
# By default do not clone in .opts method
clone = (apply_groups if clone is None else clone)

obj = self.obj if clone else self.obj.clone()
obj = self._obj if clone else self._obj.clone()
dmap = Dynamic(obj, operation=lambda obj, **dynkwargs: obj.opts(*args, **kwargs),
streams=self.obj.streams, link_inputs=True)
streams=self._obj.streams, link_inputs=True)
if not clone:
with disable_constant(self.obj):
obj.callback = self.obj.callback
self.obj.callback = dmap.callback
dmap = self.obj
with disable_constant(self._obj):
obj.callback = self._obj.callback
self._obj.callback = dmap.callback
dmap = self._obj
dmap.data = OrderedDict([(k, v.opts(*args, **kwargs))
for k, v in self.obj.data.items()])
for k, v in self._obj.data.items()])
return dmap


Expand All @@ -183,10 +183,10 @@ def _base_opts(self, *args, **kwargs):
from ..util import opts
if options is not None:
kwargs['options'] = options
return opts.apply_groups(self.obj, **dict(kwargs, **new_kwargs))
return opts.apply_groups(self._obj, **dict(kwargs, **new_kwargs))

kwargs['clone'] = False if clone is None else clone
return self.obj.options(*args, **kwargs)
return self._obj.options(*args, **kwargs)


class OptionError(Exception):
Expand Down