Module: check_mk
Branch: master
Commit: 70348ecd16ec622a2109a53a0ffd07bb29cf9ae1
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70348ecd16ec62…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed May 23 17:53:11 2018 +0200
Removed unused stuff from HTMLGenerator
Change-Id: I8d8a6e152bb247767065cc1d273028f53686e54f
---
tests/unit/web/test_htmllib_HTML.py | 1 +
web/htdocs/htmllib.py | 38 ++++++-------------------------------
2 files changed, 7 insertions(+), 32 deletions(-)
diff --git a/tests/unit/web/test_htmllib_HTML.py b/tests/unit/web/test_htmllib_HTML.py
index 231f59d..7bc3bde 100644
--- a/tests/unit/web/test_htmllib_HTML.py
+++ b/tests/unit/web/test_htmllib_HTML.py
@@ -11,6 +11,7 @@ _default.default = json.JSONEncoder().default # Save unmodified
default.
json.JSONEncoder.default = _default # replacement
+# TODO: Split this up into multiple tests
def test_class_HTML():
a = "Oneüლ,ᔑ•ﺪ͟͠•ᔐ.ლ"
b = "two"
diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py
index b97610f..54ccf1f 100644
--- a/web/htdocs/htmllib.py
+++ b/web/htdocs/htmllib.py
@@ -81,6 +81,7 @@ import cmk.paths
from cmk.exceptions import MKGeneralException
from gui_exceptions import MKUserError, RequestTimeout
+import utils
import config
import log
@@ -537,12 +538,6 @@ class HTMLGenerator(OutputFunnel):
def __init__(self):
super(HTMLGenerator, self).__init__()
-
- self.indent_level = 0
- self.indent = 2
-
- self.testing_mode = False
-
self.escaper = Escaper()
@@ -552,16 +547,6 @@ class HTMLGenerator(OutputFunnel):
def _render_attributes(self, **attrs):
- # TODO: REMOVE AFTER REFACTORING IS DONE!!
- if self.testing_mode:
- for key in attrs:
- assert key.rstrip('_') in ['class', 'id',
'src', 'type', 'name',\
- 'onclick', 'ondblclick', 'onsubmit',
'onmouseover', 'onmouseout', 'onfocus', 'onkeydown',
'onchange',\
- 'size', 'autocomplete', 'readonly',
'value', 'checked','rows', 'cols',\
- 'content', 'href', 'http-equiv',
'rel', 'for', 'title', 'target','multiple',\
- 'align', 'valign', 'style', 'width',
'height', 'colspan', 'data-type',
'data-role','selected',\
- 'cellspacing', 'cellpadding', 'border',
'allowTransparency', 'frameborder'], key
-
# make class attribute foolproof
css = []
for k in ["class_", "css", "cssclass",
"class"]:
@@ -613,16 +598,13 @@ class HTMLGenerator(OutputFunnel):
def _render_opening_tag(self, tag_name, close_tag=False, **attrs):
""" You have to replace attributes which are also python elements
such as
'class', 'id', 'for' or 'type' using a
trailing underscore (e.g. 'class_' or 'id_'). """
- #self.indent_level += self.indent
- indent = ' ' * (self.indent_level - self.indent)
- return HTML("%s<%s%s%s>" % (indent, tag_name,\
+ return HTML("<%s%s%s>" % (tag_name,\
'' if not attrs else
''.join(self._render_attributes(**attrs)),\
'' if not close_tag else ' /'))
def _render_closing_tag(self, tag_name):
- #self.indent_level -= self.indent if self.indent_level < 0 else 0
- return HTML("%s</%s>" % (' ' * self.indent_level,
tag_name))
+ return HTML("</%s>" % (tag_name))
def _render_content_tag(self, tag_name, tag_content, **attrs):
@@ -640,7 +622,6 @@ class HTMLGenerator(OutputFunnel):
tag += "</%s>" % (tag_name)
- #self.indent_level -= 1
return HTML(tag)
@@ -1109,9 +1090,6 @@ class html(HTMLGenerator):
self.start_time = time.time()
self.last_measurement = self.start_time
- # FIXME: Drop this
- self.auto_id = 0
-
# Variable management
self._var_stash = []
@@ -1471,12 +1449,6 @@ class html(HTMLGenerator):
# Other things
#
- # TODO: Can this please be dropped?
- def some_id(self):
- self.auto_id += 1
- return "id_%d" % self.auto_id
-
-
def measure_time(self, name):
self.times.setdefault(name, 0.0)
now = time.time()
@@ -2131,7 +2103,7 @@ class html(HTMLGenerator):
if add_transid:
href += "&_transid=%s" % self.transaction_manager.get()
if not obj_id:
- obj_id = self.some_id()
+ obj_id = utils.gen_id()
self.input(name=obj_id, type_="button",
id_=obj_id, class_=["button", "buttonlink"],
value=text, style=style,
@@ -2961,6 +2933,8 @@ class html(HTMLGenerator):
#
# Per request caching
+ # TODO: Remove this cache here. Do we need some generic functionality
+ # like this? Probably use some more generic / standard thing.
#