[checkmk-commits] Removed dead add_var() methods.

Module: check_mk Branch: master Commit: 9fc838f4cc3e7f973c84eea46d56fd0d9299cd42 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9fc838f4cc3e7f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jan 8 09:48:33 2019 +0100 Removed dead add_var() methods. Change-Id: Id45f7ac99ebee484e13f3c65d3280a354344c944 --- cmk/gui/htmllib.py | 5 ----- cmk/gui/http.py | 6 ------ tests/unit/cmk/gui/old/html_tests.py | 2 +- tests/unit/cmk/gui/test_http.py | 4 ++-- tests/unit/cmk/gui/test_table.py | 4 ++-- 5 files changed, 5 insertions(+), 16 deletions(-) diff --git a/cmk/gui/htmllib.py b/cmk/gui/htmllib.py index 8828f34..79d4a71 100644 --- a/cmk/gui/htmllib.py +++ b/cmk/gui/htmllib.py @@ -1134,11 +1134,6 @@ class html(HTMLGenerator): def all_varnames_with_prefix(self, prefix): return self.request.all_varnames_with_prefix(prefix) - # Adds a variable to listvars and also set it - # TODO: Refactor call sites to html.request.* - def add_var(self, varname, value): - self.request.add_var(varname, value) - # TODO: Refactor call sites to html.request.* def set_var(self, varname, value): self.request.set_var(varname, value) diff --git a/cmk/gui/http.py b/cmk/gui/http.py index 5fb71c6..47c7fb1 100644 --- a/cmk/gui/http.py +++ b/cmk/gui/http.py @@ -185,12 +185,6 @@ class Request(object): return [self.vars[varname]] return [] - # Adds a variable to _listvars and also set it - def add_var(self, varname, value): - self._listvars.setdefault(varname, []) - self._listvars[varname].append(value) - self.vars[varname] = value - # TODO: self.vars should be strictly read only in the Request() object def set_var(self, varname, value): if value is None: diff --git a/tests/unit/cmk/gui/old/html_tests.py b/tests/unit/cmk/gui/old/html_tests.py index decd326..23f5aba 100644 --- a/tests/unit/cmk/gui/old/html_tests.py +++ b/tests/unit/cmk/gui/old/html_tests.py @@ -156,7 +156,7 @@ def add_html_vars(html, add_vars): return for key, value in add_vars.iteritems(): if value is not None: - html.add_var(key, value) + html.set_var(key, value) # set the state of an html object diff --git a/tests/unit/cmk/gui/test_http.py b/tests/unit/cmk/gui/test_http.py index c35858d..2ac4928 100644 --- a/tests/unit/cmk/gui/test_http.py +++ b/tests/unit/cmk/gui/test_http.py @@ -30,8 +30,8 @@ def test_cookie_handling(register_builtin_html, monkeypatch): # TODO: Write valid test def test_request_processing(register_builtin_html): - html.add_var("varname", "1a") - html.add_var("varname2", 1) + html.set_var("varname", "1a") + html.set_var("varname2", "1") html.get_unicode_input("varname", deflt = "lol") html.get_integer_input("varname2") diff --git a/tests/unit/cmk/gui/test_table.py b/tests/unit/cmk/gui/test_table.py index 9966f13..1eee83c 100644 --- a/tests/unit/cmk/gui/test_table.py +++ b/tests/unit/cmk/gui/test_table.py @@ -178,8 +178,8 @@ def test_table_cubical(register_builtin_html, monkeypatch, sortable, searchable, table_id = 0 title = " TEST " separator = ';' - html.add_var('_%s_sort' % table_id, "1,0") - html.add_var('_%s_actions' % table_id, '1') + html.set_var('_%s_sort' % table_id, "1,0") + html.set_var('_%s_actions' % table_id, '1') # Table construction with html.plugged():