Module: check_mk
Branch: master
Commit: 59ad118a7ba783ef3b530df5b0cb2e11bfbb2f26
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59ad118a7ba783…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Mon Dec 10 12:34:07 2018 +0100
OutputFunnel.is_plugged() is an implementation detail.
Change-Id: I05a700128bd8d4def38b118203d86d3095c471ac
---
cmk/gui/htmllib.py | 12 ++++++------
tests/unit/cmk/gui/test_htmllib_OutputFunnel.py | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/cmk/gui/htmllib.py b/cmk/gui/htmllib.py
index 0987d83..d5f9339 100644
--- a/cmk/gui/htmllib.py
+++ b/cmk/gui/htmllib.py
@@ -387,7 +387,7 @@ class OutputFunnel(object):
raise MKGeneralException(
_('Type Error: html.write accepts str and unicode input objects
only!'))
- if self.is_plugged():
+ if self._is_plugged():
self.plug_text[self.plug_level].append(text)
else:
# encode when really writing out the data. Not when writing plugged,
@@ -417,12 +417,12 @@ class OutputFunnel(object):
self.plug_text.append([])
self.plug_level += 1
- def is_plugged(self):
+ def _is_plugged(self):
return self.plug_level > -1
# Pull the plug for a moment to allow the sink content to pass through.
def flush(self):
- if not self.is_plugged():
+ if not self._is_plugged():
return None
text = "".join(self.plug_text[self.plug_level])
@@ -433,7 +433,7 @@ class OutputFunnel(object):
# Get the sink content in order to do something with it.
def drain(self):
- if not self.is_plugged():
+ if not self._is_plugged():
return ''
text = "".join(self.plug_text[self.plug_level])
@@ -441,7 +441,7 @@ class OutputFunnel(object):
return text
def unplug(self):
- if not self.is_plugged():
+ if not self._is_plugged():
return
self.flush()
@@ -449,7 +449,7 @@ class OutputFunnel(object):
self.plug_level -= 1
def unplug_all(self):
- while self.is_plugged():
+ while self._is_plugged():
self.unplug()
diff --git a/tests/unit/cmk/gui/test_htmllib_OutputFunnel.py
b/tests/unit/cmk/gui/test_htmllib_OutputFunnel.py
index 3dd238a..9bedae7 100644
--- a/tests/unit/cmk/gui/test_htmllib_OutputFunnel.py
+++ b/tests/unit/cmk/gui/test_htmllib_OutputFunnel.py
@@ -102,7 +102,7 @@ def test_output_funnel_context_raise(html):
except Exception as e:
assert "%s" % e == "Test exception"
finally:
- assert not html.is_plugged()
+ assert html.plug_text == []
def test_output_funnel_try_finally(html):