[checkmk-commits] htmllib: Cleaned up duplicate code a bit

Module: check_mk Branch: master Commit: d977515e14cf9fe0f8279945e1ba49891a370768 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d977515e14cf9f… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Tue Dec 6 11:41:34 2016 +0100 htmllib: Cleaned up duplicate code a bit --- web/htdocs/htmllib.py | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index e38d826..56ee1a9 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -408,16 +408,22 @@ class HTMLGenerator(Escaper, OutputFunnel): def _render_content_tag(self, tag_name, tag_content, **attrs): - tag = '' + tag = self._render_opening_tag(tag_name, **attrs) + if tag_content in ['', None]: - tag = "%s</%s>" % (self._render_opening_tag(tag_name, **attrs), tag_name) - elif isinstance(tag_content, HTML): - tag = "%s%s</%s>" % (self._render_opening_tag(tag_name, **attrs).rstrip('\n'), - tag_content.lstrip(' ').rstrip('\n'), tag_name) + pass + else: - tag = "%s%s</%s>" % (self._render_opening_tag(tag_name, **attrs).rstrip('\n'),\ - self._escape_text(tag_content),\ - tag_name) + tag = tag.rstrip("\n") + + if isinstance(tag_content, HTML): + tag += tag_content.lstrip(' ').rstrip('\n') + else: + self.debug((tag_content, self._escape_text(tag_content))) + tag += self._escape_text(tag_content) + + tag += "</%s>" % (tag_name) + #self.indent_level -= 1 return HTML(tag)