[checkmk-commits] views/inventory.py: make use of deecorator

Module: check_mk Branch: master Commit: 768f6ca8601bbd390a733f505fd127df9646fd5f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=768f6ca8601bbd… Author: Moritz Kiemer &lt;mo(a)mathias-kettner.de&gt; Date: Wed Feb 20 10:51:58 2019 +0100 views/inventory.py: make use of deecorator side effect: properly handle '0' cases. Change-Id: Iad8cfcbd039fa41b68ca107c9a709ede5c0465e4 --- cmk/gui/plugins/views/inventory.py | 31 +++++++------------------------ 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/cmk/gui/plugins/views/inventory.py b/cmk/gui/plugins/views/inventory.py index 8f9372d..958aa45 100644 --- a/cmk/gui/plugins/views/inventory.py +++ b/cmk/gui/plugins/views/inventory.py @@ -305,8 +305,6 @@ def inv_paint_generic(v): @decorate_inv_paint def inv_paint_hz(hz): - if hz is None: - return "", "" if hz < 10: return "number", "%.2f" % hz elif hz < 100: @@ -386,9 +384,7 @@ def _nic_speed_human_readable(bits_per_second): @decorate_inv_paint def inv_paint_nic_speed(bits_per_second): - if bits_per_second: - return "number", _nic_speed_human_readable(int(bits_per_second)) - return "", "" + return "number", _nic_speed_human_readable(int(bits_per_second)) @decorate_inv_paint @@ -458,38 +454,28 @@ def inv_paint_route_type(rt): @decorate_inv_paint def inv_paint_volt(volt): - if volt: - return "number", "%.1f V" % volt - return "", "" + return "number", "%.1f V" % volt @decorate_inv_paint def inv_paint_date(timestamp): - if timestamp: - date_painted = time.strftime("%Y-%m-%d", time.localtime(timestamp)) - return "number", "%s" % date_painted - return "", "" + date_painted = time.strftime("%Y-%m-%d", time.localtime(timestamp)) + return "number", "%s" % date_painted @decorate_inv_paint def inv_paint_date_and_time(timestamp): - if timestamp: - date_painted = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(timestamp)) - return "number", "%s" % date_painted - return "", "" + date_painted = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(timestamp)) + return "number", "%s" % date_painted @decorate_inv_paint def inv_paint_age(age): - if age: - return "number", cmk.utils.render.approx_age(age) - return "", "" + return "number", cmk.utils.render.approx_age(age) @decorate_inv_paint def inv_paint_bool(value): - if value is None: - return "", "" return "", (_("Yes") if value else _("No")) @@ -530,9 +516,6 @@ def inv_paint_timestamp_as_age_days(timestamp): @decorate_inv_paint def inv_paint_docker_labels(labels): - if labels is None: - return "", "" - return "labels", html.render_br().join(sorted(labels.split(", ")))