Skip to content

Commit

Permalink
Additional fixes to param API usage (#998)
Browse files Browse the repository at this point in the history
  • Loading branch information
jlstevens authored and philippjfr committed Jan 23, 2020
1 parent fec865f commit 0c924a1
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion panel/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ def set(self, **kwargs):
try:
yield
finally:
self.set_param(**dict(values))
self.param.set_param(**dict(values))
for k, v in overrides:
setattr(self, k+'_', v)

Expand Down
10 changes: 5 additions & 5 deletions panel/links.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ def init(self):
if self.source in self.registry:
links = self.registry[self.source]
params = {
k: v for k, v in self.get_param_values() if k != 'name'}
k: v for k, v in self.param.get_param_values() if k != 'name'}
for link in links:
link_params = {
k: v for k, v in link.get_param_values() if k != 'name'}
k: v for k, v in link.param.get_param_values() if k != 'name'}
if not hasattr(link, 'target'):
pass
elif (type(link) is type(self) and link.source is self.source
Expand Down Expand Up @@ -171,10 +171,10 @@ def link(self):
if self.source in self.registry:
links = self.registry[self.source]
params = {
k: v for k, v in self.get_param_values() if k != 'name'}
k: v for k, v in self.param.get_param_values() if k != 'name'}
for link in links:
link_params = {
k: v for k, v in link.get_param_values() if k != 'name'}
k: v for k, v in link.param.get_param_values() if k != 'name'}
if (type(link) is type(self) and link.source is self.source
and link.target is self.target and params == link_params):
return
Expand Down Expand Up @@ -250,7 +250,7 @@ def _resolve_model(cls, root_model, obj, model_spec):
return model

def _init_callback(self, root_model, link, source, src_spec, target, tgt_spec, code):
references = {k: v for k, v in link.get_param_values()
references = {k: v for k, v in link.param.get_param_values()
if k not in ('source', 'target', 'name', 'code', 'args')}

src_model = self._resolve_model(root_model, source, src_spec[0])
Expand Down
2 changes: 1 addition & 1 deletion panel/pane/holoviews.py
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ def _get_model(self, doc, root=None, parent=None, comm=None):
else:
self._responsive_content = False

kwargs = {p: v for p, v in self.get_param_values()
kwargs = {p: v for p, v in self.param.get_param_values()
if p in Layoutable.param and p != 'name'}
child_pane = self._panes.get(backend, Pane)(state, **kwargs)
self._update_plot(plot, child_pane)
Expand Down
2 changes: 1 addition & 1 deletion panel/widgets/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def _get_model(self, doc, root=None, parent=None, comm=None):
if root is None:
root = model
# Link parameters and bokeh model
values = dict(self.get_param_values())
values = dict(self.param.get_param_values())
properties = self._filter_properties(list(self._process_param_change(values)))
self._models[root.ref['id']] = (model, parent)
self._link_props(model, properties, doc, root, comm)
Expand Down

0 comments on commit 0c924a1

Please sign in to comment.