Skip to content

Commit

Permalink
Now formatting via the new label property in param
Browse files Browse the repository at this point in the history
  • Loading branch information
jlstevens committed Mar 8, 2019
1 parent c9c779f commit 90c1a34
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 41 deletions.
2 changes: 1 addition & 1 deletion panel/param.py
Expand Up @@ -22,7 +22,7 @@
from .links import Link
from .pane.base import Pane, PaneBase
from .util import (
abbreviated_repr, default_label_formatter, full_groupby,
abbreviated_repr, full_groupby,
get_method_owner, is_parameterized, param_name)
from .viewable import Layoutable, Reactive
from .widgets import (
Expand Down
19 changes: 1 addition & 18 deletions panel/tests/test_util.py
Expand Up @@ -4,8 +4,7 @@

from panel.pane import PaneBase
from panel.util import (
render_mimebundle, default_label_formatter, get_method_owner,
abbreviated_repr
render_mimebundle, get_method_owner,abbreviated_repr
)


Expand All @@ -29,22 +28,6 @@ def test_render_mimebundle(document, comm):
assert data['application/vnd.holoviews_exec.v0+json'] == ''


def test_default_label_formatter():
assert default_label_formatter('a_b_C') == 'A b C'


def test_default_label_formatter_not_capitalized():
assert default_label_formatter.instance(capitalize=False)('a_b_C') == 'a b C'


def test_default_label_formatter_not_replace_underscores():
assert default_label_formatter.instance(replace_underscores=False)('a_b_C') == 'A_b_C'


def test_default_label_formatter_overrides():
assert default_label_formatter.instance(overrides={'a': 'b'})('a') == 'b'


def test_abbreviated_repr_dict():
assert abbreviated_repr({'key': 'some really, really long string'}) == "{'key': 'some really, ...}"

Expand Down
22 changes: 0 additions & 22 deletions panel/util.py
Expand Up @@ -191,28 +191,6 @@ def value_as_datetime(value):
return value


class default_label_formatter(param.ParameterizedFunction):
"Default formatter to turn parameter names into appropriate widget labels."

capitalize = param.Boolean(default=True, doc="""
Whether or not the label should be capitalized.""")

replace_underscores = param.Boolean(default=True, doc="""
Whether or not underscores should be replaced with spaces.""")

overrides = param.Dict(default={}, doc="""
Allows custom labels to be specified for specific parameter
names using a dictionary where key is the parameter name and the
value is the desired label.""")

def __call__(self, pname):
if pname in self.overrides:
return self.overrides[pname]
if self.replace_underscores:
pname = pname.replace('_',' ')
if self.capitalize:
pname = pname[:1].upper() + pname[1:]
return pname


class StoppableThread(threading.Thread):
Expand Down

0 comments on commit 90c1a34

Please sign in to comment.