[checkmk-commits] Check_MK Git: check_mk: fix json/python Webservice

Module: check_mk Branch: master Commit: eaa7c7037170a6ce554ebb7cfaa8cfa8ed013ccc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eaa7c7037170a6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 28 19:59:14 2011 +0100 fix json/python Webservice --- ChangeLog | 3 +++ web/plugins/views/webservice.py | 6 ++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4067e36..06a904e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -34,6 +34,9 @@ * FIX: cisco_temp_perf: fix return state in case of WARNING (was 0 = OK) * FIX: repair PNP template for df when using trends + Multisite: + * FIX: fix json/python Webservice + 1.1.9i9: Core, Setup, etc.: * FIX: check_mk_templates.cfg: add missing check_period for hosts diff --git a/web/plugins/views/webservice.py b/web/plugins/views/webservice.py index 431ef04..3646dcd 100644 --- a/web/plugins/views/webservice.py +++ b/web/plugins/views/webservice.py @@ -34,8 +34,7 @@ multisite_layouts["python-raw"] = { "hide" : True, } -def render_python(data, view, group_painters, painters, num_columns): - columns, rows = data +def render_python(rows, view, group_painters, painters, num_columns): html.write("[\n") html.write(repr([p[0]["name"] for p in painters])) html.write(",\n") @@ -64,8 +63,7 @@ def encode_string_json(s): return '"' + json_escape.sub(lambda m: json_encoding_table[m.group(0)], s) + '"' -def render_json(data, view, group_painters, painters, num_columns): - columns, rows = data +def render_json(rows, view, group_painters, painters, num_columns): html.write("[\n") html.write(repr([p[0]["name"] for p in painters])) for row in rows: