[checkmk-commits] Re-use drain(). Added a few TODOs.

Module: check_mk Branch: master Commit: 1e9fe3664cb3816f94e14199bb379ee9d184e949 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e9fe3664cb381… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Dec 10 13:16:29 2018 +0100 Re-use drain(). Added a few TODOs. Change-Id: I68599fad22c573871ef5c6db0aa34825848bacbe --- cmk/gui/htmllib.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cmk/gui/htmllib.py b/cmk/gui/htmllib.py index c2c8a89..985c77c 100644 --- a/cmk/gui/htmllib.py +++ b/cmk/gui/htmllib.py @@ -400,6 +400,7 @@ class OutputFunnel(object): def _lowlevel_write(self, text): raise NotImplementedError() + # TODO: Only use this and make plug()/unplug() private methods. @contextmanager def plugged(self): self.plug() @@ -420,7 +421,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(): # TODO: Raise exception or even remove "if"? return '' text = "".join(self.plug_text.pop()) @@ -428,12 +429,14 @@ class OutputFunnel(object): return text def unplug(self): - if not self._is_plugged(): + if not self._is_plugged(): # TODO: Raise exception or even remove "if"? return - text = "".join(self.plug_text.pop()) + text = self.drain() + self.plug_text.pop() self.write(text) + # TODO: Nuke this when we use plugged() exclusively. def unplug_all(self): while self._is_plugged(): self.unplug()