Module: check_mk Branch: master Commit: d064f7c4c8e323def5f4ae830fe6a8d5d9a2df16 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d064f7c4c8e323… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 25 14:01:01 2016 +0200 fixed pylint issue --- modules/check_mk.py | 1 + web/htdocs/webapi.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 12e037d..259f31d 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -758,6 +758,7 @@ def convert_host_ruleset(ruleset, with_foreign_hosts): # TODO: Remove this when checks have been moved to cmk_base.checks hosttags_match_taglist = rulesets.hosttags_match_taglist +get_rule_options = rulesets.get_rule_options def host_extra_conf(hostname, ruleset): diff --git a/web/htdocs/webapi.py b/web/htdocs/webapi.py index d0ddd6b..d9fd2b2 100644 --- a/web/htdocs/webapi.py +++ b/web/htdocs/webapi.py @@ -96,12 +96,12 @@ def page_api(): response = { "result_code": 0, "result": action_response } except MKException, e: - response = { "result_code": 1, "result": str(e) } + response = { "result_code": 1, "result": "%s" % e } except Exception, e: if config.debug: raise - response = { "result_code": 1, "result": str(e) } + response = { "result_code": 1, "result": "%s" % e } if html.output_format == "json": html.write(json.dumps(response))