[checkmk-commits] Moved quote_shell_string() to cmk.utils

Module: check_mk Branch: master Commit: 164bd22aaa1625f29aa1be434f0d010e93d281ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=164bd22aaa1625… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 16 18:41:21 2018 +0100 Moved quote_shell_string() to cmk.utils Change-Id: I39f70a4d1c07e66d611e9aac3aa94de02f115940 --- cmk/utils.py | 5 +++++ cmk_base/utils.py | 11 +++++------ web/htdocs/lib.py | 6 ------ web/htdocs/metrics.py | 5 +++-- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/cmk/utils.py b/cmk/utils.py index 3afbc1c..9baf269 100644 --- a/cmk/utils.py +++ b/cmk/utils.py @@ -34,3 +34,8 @@ def make_utf8(x): return x.encode('utf-8') else: return x + + +def quote_shell_string(s): + """Quote string for use as arguments on the shell""" + return "'" + s.replace("'", "'\"'\"'") + "'" diff --git a/cmk_base/utils.py b/cmk_base/utils.py index ac6c052..22acd96 100644 --- a/cmk_base/utils.py +++ b/cmk_base/utils.py @@ -32,7 +32,11 @@ import signal import time from cmk.exceptions import MKGeneralException, MKTerminate -from cmk.utils import make_utf8 + +# TODO: Clean up the call sites +from cmk.utils import \ + make_utf8, \ + quote_shell_string # TODO: Try to find a better place for them. @@ -48,11 +52,6 @@ def worst_service_state(*states): return max(states) -def quote_shell_string(s): - """Quote string for use as arguments on the shell""" - return "'" + s.replace("'", "'\"'\"'") + "'" - - # Works with Check_MK version (without tailing .cee and/or .demo) def is_daily_build_version(v): return len(v) == 10 or '-' in v diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 5bdd54f..9118a5f 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -128,12 +128,6 @@ def pnp_cleanup(s): .replace('\\', '_') -# Quote string for use as arguments on the shell -# TODO: Move to Check_MK library -def quote_shell_string(s): - return "'" + s.replace("'", "'\"'\"'") + "'" - - def log_exception(msg=None): if msg is None: msg = _('Internal error') diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 1a9c9a4..6d74088 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -47,6 +47,7 @@ from gui_exceptions import MKGeneralException, MKUserError, MKInternalError, \ MKUnauthenticatedException, MKAuthException import livestatus +import cmk.utils from cmk.regex import regex import json @@ -1569,8 +1570,8 @@ def render_graph_pnp(graph_template, translated_metrics): vertical_label = graph_template.get("vertical_label", vertical_label) rrdgraph_arguments += " --vertical-label %s --title %s " % ( - quote_shell_string(vertical_label or " "), - quote_shell_string(graph_title)) + cmk.utils.quote_shell_string(vertical_label or " "), + cmk.utils.quote_shell_string(graph_title)) min_value, max_value = get_graph_range(graph_template, translated_metrics) if min_value != None and max_value != None: