Checkmk git commits January 2019

checkmk-commits@lists.checkmk.com

15 participants
490 discussions

Adapted test case for base path redirection.

by Sven Panne

Module: check_mk Branch: master Commit: 595c263747a1ce63e8a22676eea99cdc05ce1b3f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=595c263747a1ce… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jan 4 08:50:14 2019 +0100 Adapted test case for base path redirection. The previous state was really confusing: We redirect via FOUND (302), but due to a bug this status code was rendered as "301 Moved Permanently". The fix is to keep redirecting via the FOUND status code (which is the same default as werkzeug/flask) and fix the test case instead. This is supported by WebSession.check_redirect(), too. Anyway, we should have a closer look at this at some point... Change-Id: I2ab2301953c788aa7fcdb94627b4f761c3dda5f4 --- tests/integration/omd/test_web_access.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/integration/omd/test_web_access.py b/tests/integration/omd/test_web_access.py index 06d8cd4..b518047 100644 --- a/tests/integration/omd/test_web_access.py +++ b/tests/integration/omd/test_web_access.py @@ -29,12 +29,13 @@ def test_base_path_redirects(site): def test_cmk_base_path_access(site): web = CMKWebSession(site) + # TODO: Figure out if which status code we *really* expect here: 301 or 302? web.check_redirect("/%s/check_mk/" % site.id, - expected_code=301, + expected_code=302, expected_target="/%s/check_mk/login.py?_origtarget=index.py" % site.id) web.check_redirect("/%s/check_mk/index.py" % site.id, - expected_code=301, + expected_code=302, expected_target="/%s/check_mk/login.py?_origtarget=index.py" % site.id)

5 years, 5 months

Fixed a TODO. Tiny simplification and cleanup.

by Sven Panne

Module: check_mk Branch: master Commit: ae3be96addda0f62bb5fe3a93ba605884a069a3e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae3be96addda0f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jan 3 15:11:16 2019 +0100 Fixed a TODO. Tiny simplification and cleanup. Change-Id: I2ca6674686b951444402c06e13ad135e81341f37 --- cmk/gui/exceptions.py | 19 +++++++------------ cmk/gui/login.py | 3 ++- web/app/index.wsgi | 4 ++-- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/cmk/gui/exceptions.py b/cmk/gui/exceptions.py index b2e81ad..fb9406b 100644 --- a/cmk/gui/exceptions.py +++ b/cmk/gui/exceptions.py @@ -43,24 +43,19 @@ class RequestTimeout(MKTimeout): class FinalizeRequest(Exception): """Is used to end the HTTP request processing from deeper code levels""" - # TODO: Drop this default and make exit code explicit for all call sites - def __init__(self, code=None): - # type: (Optional[int]) -> None - self.status = code or httplib.OK - super(FinalizeRequest, - self).__init__("%d %s" % (self.status, HTTP_STATUS_CODES[self.status])) + def __init__(self, code): + # type: (int) -> None + super(FinalizeRequest, self).__init__("%d %s" % (code, HTTP_STATUS_CODES[code])) + self.status = code class HTTPRedirect(FinalizeRequest): """Is used to end the HTTP request processing from deeper code levels and making the client request another page after receiving the response.""" - def __init__(self, url, code=httplib.FOUND): - # type: (str, int) -> None - super(HTTPRedirect, self).__init__(code) - if code not in [httplib.MOVED_PERMANENTLY, httplib.FOUND]: - raise Exception("Invalid status code: %d" % code) - + def __init__(self, url): + # type: (str) -> None + super(HTTPRedirect, self).__init__(httplib.FOUND) self.url = url #type: str diff --git a/cmk/gui/login.py b/cmk/gui/login.py index 563867f..22f4daa 100644 --- a/cmk/gui/login.py +++ b/cmk/gui/login.py @@ -24,6 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +import httplib import os import time import traceback @@ -530,7 +531,7 @@ def page_logout(): html.response.set_http_header( 'WWW-Authenticate', 'Basic realm="OMD Monitoring Site %s"' % config.omd_site()) html.response.set_cookie('logout', '1') - raise FinalizeRequest(401) + raise FinalizeRequest(httplib.UNAUTHORIZED) else: html.response.del_cookie('logout') html.response.http_redirect(config.url_prefix() + 'check_mk/') diff --git a/web/app/index.wsgi b/web/app/index.wsgi index 6ae66a0..501a72f 100644 --- a/web/app/index.wsgi +++ b/web/app/index.wsgi @@ -190,7 +190,7 @@ class Application(object): handler() except Exception, e: self._show_exception_info(e) - raise FinalizeRequest() + raise FinalizeRequest(httplib.OK) # Ensure the user is authenticated. This call is wrapping all the different # authentication modes the Check_MK GUI supports and initializes the logged @@ -231,7 +231,7 @@ class Application(object): # requested page is performed. login.page_login(self._plain_error()) - raise FinalizeRequest() + raise FinalizeRequest(httplib.OK) def _localize_request(self): previous_language = cmk.gui.i18n.get_current_language()

5 years, 5 months

Don't run mypy on dead file.

by Sven Panne

Module: check_mk Branch: master Commit: 33f9827d91a0e6246381c4c2f3543f4b975d5bbe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33f9827d91a0e6… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jan 3 15:23:17 2019 +0100 Don't run mypy on dead file. Change-Id: I6ad870754d7b45c21a3ff285a43cab8645623dec --- tests/static/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/static/Makefile b/tests/static/Makefile index 38855ab..91bab6f 100644 --- a/tests/static/Makefile +++ b/tests/static/Makefile @@ -5,7 +5,7 @@ FILES_TO_CHECK := $(realpath $(addprefix ../../cmk/ec/,defaults.py export.py mai $(realpath $(wildcard ../../cmk/utils/*.py)) \ $(realpath $(wildcard ../../cmk/notification_plugins/*.py)) \ $(realpath $(wildcard ../../cmk_base/*.py)) \ - $(realpath $(addprefix ../../cmk/gui/,dashboard.py exceptions.py globals.py htmllib.py http_status.py \ + $(realpath $(addprefix ../../cmk/gui/,dashboard.py exceptions.py globals.py htmllib.py \ i18n.py sidebar.py sites.py table.py visuals.py permissions.py)) \ $(realpath $(addprefix ../../cmk/gui/plugins/userdb/,htpasswd.py utils.py)) \ $(realpath $(wildcard ../../cmk/gui/plugins/wato/utils/*.py)) \

5 years, 5 months

Decouple Respose from Request.

by Sven Panne

Module: check_mk Branch: master Commit: 104e72ce3f000d7551a8afcf23be031381be8d81 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=104e72ce3f000d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jan 3 14:22:12 2019 +0100 Decouple Respose from Request. Change-Id: Id422425e0ad39166d290ca2f14c486167720e724 --- cmk/gui/http.py | 8 +++----- tests/unit/cmk/gui/conftest.py | 2 +- tests/unit/cmk/gui/old/classes.py | 2 +- tests/unit/cmk/gui/test_http.py | 3 +-- web/app/index.wsgi | 2 +- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/cmk/gui/http.py b/cmk/gui/http.py index a2c428a..99334bc 100644 --- a/cmk/gui/http.py +++ b/cmk/gui/http.py @@ -256,12 +256,10 @@ class Response(object): over to the WSGI server for sending the response to the client. """ - def __init__(self, request): + def __init__(self, secure): super(Response, self).__init__() self._logger = log.logger.getChild("http.Response") - - self._request = request - + self._secure = secure self._status_code = cmk.gui.http_status.HTTP_OK self._output = [] self._headers_out = [] @@ -300,7 +298,7 @@ class Response(object): # Tell client not to use the cookie within javascript httponly=True, # Tell client to only use the cookie for SSL connections - secure=self._request.is_ssl_request, + secure=self._secure, expires=expires, ) diff --git a/tests/unit/cmk/gui/conftest.py b/tests/unit/cmk/gui/conftest.py index 17f10ad..fae87a4 100644 --- a/tests/unit/cmk/gui/conftest.py +++ b/tests/unit/cmk/gui/conftest.py @@ -21,6 +21,6 @@ def register_builtin_html(): "REQUEST_URI": "", } _request = http.Request(wsgi_environ) - _response = http.Response(_request) + _response = http.Response(_request.is_ssl_request) html.set_current(htmllib.html(_request, _response)) diff --git a/tests/unit/cmk/gui/old/classes.py b/tests/unit/cmk/gui/old/classes.py index 64960ba..c863dd9 100644 --- a/tests/unit/cmk/gui/old/classes.py +++ b/tests/unit/cmk/gui/old/classes.py @@ -18,7 +18,7 @@ class HTMLTester(htmllib.html): "SCRIPT_NAME" : "", } _request = http.Request(wsgi_environ) - _response = http.Response(_request) + _response = http.Response(_request.is_ssl_request) super(HTMLTester, self).__init__(_request, _response) diff --git a/tests/unit/cmk/gui/test_http.py b/tests/unit/cmk/gui/test_http.py index bcf03d0..8cc0c96 100644 --- a/tests/unit/cmk/gui/test_http.py +++ b/tests/unit/cmk/gui/test_http.py @@ -52,8 +52,7 @@ def test_response_set_cookie(register_builtin_html): def test_response_set_cookie_secure(register_builtin_html, monkeypatch): - # TODO: Find better way to directly patch the property html.request.is_ssl_request - monkeypatch.setitem(html.request._wsgi_environ, "HTTP_X_FORWARDED_PROTO", "https") + monkeypatch.setattr(html.response, "_secure", True) html.response.set_cookie("auth_SITE", "user:123456:abcdefg") diff --git a/web/app/index.wsgi b/web/app/index.wsgi index 43d73e5..6f62693 100644 --- a/web/app/index.wsgi +++ b/web/app/index.wsgi @@ -66,7 +66,7 @@ class Application(object): def __init__(self, wsgi_environ, start_response): self._start_response = start_response self._request = cmk.gui.http.Request(wsgi_environ) - self._response = cmk.gui.http.Response(self._request) + self._response = cmk.gui.http.Response(self._request.is_ssl_request) # Create an object that contains all data about the request and # helper functions for creating valid HTML. Parse URI and

5 years, 5 months

Replaced cmk.gui.http_status by standard facilities.

by Sven Panne

Module: check_mk Branch: master Commit: 72bc1cdcfe10c0d93ebc5ba320a80d14cbf8445e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=72bc1cdcfe10c0… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jan 3 15:02:37 2019 +0100 Replaced cmk.gui.http_status by standard facilities. Change-Id: I93346240a56dbf4d5126a8effc4f74f3bf62aa09 --- cmk/gui/exceptions.py | 16 ++++----- cmk/gui/http.py | 8 ++--- cmk/gui/http_status.py | 93 -------------------------------------------------- web/app/index.wsgi | 6 ++-- 4 files changed, 15 insertions(+), 108 deletions(-) diff --git a/cmk/gui/exceptions.py b/cmk/gui/exceptions.py index d2c4ed3..b2e81ad 100644 --- a/cmk/gui/exceptions.py +++ b/cmk/gui/exceptions.py @@ -24,9 +24,11 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +import httplib from typing import Optional, Text # pylint: disable=unused-import -import cmk.gui.http_status +from werkzeug.http import HTTP_STATUS_CODES + from cmk.gui.i18n import _ from cmk.utils.exceptions import MKGeneralException, MKException, MKTimeout @@ -44,21 +46,19 @@ class FinalizeRequest(Exception): # TODO: Drop this default and make exit code explicit for all call sites def __init__(self, code=None): # type: (Optional[int]) -> None - self.status = code or cmk.gui.http_status.HTTP_OK # type: int - super(FinalizeRequest, self).__init__(cmk.gui.http_status.status_with_reason(self.status)) + self.status = code or httplib.OK + super(FinalizeRequest, + self).__init__("%d %s" % (self.status, HTTP_STATUS_CODES[self.status])) class HTTPRedirect(FinalizeRequest): """Is used to end the HTTP request processing from deeper code levels and making the client request another page after receiving the response.""" - def __init__(self, url, code=cmk.gui.http_status.HTTP_MOVED_TEMPORARILY): + def __init__(self, url, code=httplib.FOUND): # type: (str, int) -> None super(HTTPRedirect, self).__init__(code) - if code not in [ - cmk.gui.http_status.HTTP_MOVED_PERMANENTLY, - cmk.gui.http_status.HTTP_MOVED_TEMPORARILY - ]: + if code not in [httplib.MOVED_PERMANENTLY, httplib.FOUND]: raise Exception("Invalid status code: %d" % code) self.url = url #type: str diff --git a/cmk/gui/http.py b/cmk/gui/http.py index 99334bc..d8a19f4 100644 --- a/cmk/gui/http.py +++ b/cmk/gui/http.py @@ -25,15 +25,15 @@ # Boston, MA 02110-1301 USA. """Wrapper layer between WSGI and the GUI application code""" -import re import cgi +import httplib +import re import six import werkzeug.http import cmk.gui.log as log from cmk.gui.i18n import _ -import cmk.gui.http_status from cmk.gui.exceptions import HTTPRedirect @@ -260,7 +260,7 @@ class Response(object): super(Response, self).__init__() self._logger = log.logger.getChild("http.Response") self._secure = secure - self._status_code = cmk.gui.http_status.HTTP_OK + self._status_code = httplib.OK self._output = [] self._headers_out = [] @@ -319,7 +319,7 @@ class Response(object): @property def http_status(self): """Provides the HTTP response status header (code incl. text)""" - return cmk.gui.http_status.status_with_reason(self._status_code) + return "%d %s" % (self._status_code, werkzeug.http.HTTP_STATUS_CODES[self._status_code]) @property def headers(self): diff --git a/cmk/gui/http_status.py b/cmk/gui/http_status.py deleted file mode 100644 index 75d4316..0000000 --- a/cmk/gui/http_status.py +++ /dev/null @@ -1,93 +0,0 @@ -#!/usr/bin/env python -# -*- encoding: utf-8; py-indent-offset: 4 -*- -# +------------------------------------------------------------------+ -# | ____ _ _ __ __ _ __ | -# | / ___| |__ ___ ___| | __ | \/ | |/ / | -# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | -# | | |___| | | | __/ (__| < | | | | . \ | -# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | -# | | -# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | -# +------------------------------------------------------------------+ -# -# This file is part of Check_MK. -# The official homepage is at http://mathias-kettner.de/check_mk. -# -# check_mk is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation in version 2. check_mk is distributed -# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- -# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. See the GNU General Public License for more de- -# tails. You should have received a copy of the GNU General Public -# License along with GNU Make; see the file COPYING. If not, write -# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, -# Boston, MA 02110-1301 USA. - -# TODO: Use definitions from httplib (Python 3: http.HTTPStatus) -HTTP_CONTINUE = 100 -HTTP_SWITCHING_PROTOCOLS = 101 -HTTP_PROCESSING = 102 -HTTP_OK = 200 -HTTP_CREATED = 201 -HTTP_ACCEPTED = 202 -HTTP_NON_AUTHORITATIVE = 203 -HTTP_NO_CONTENT = 204 -HTTP_RESET_CONTENT = 205 -HTTP_PARTIAL_CONTENT = 206 -HTTP_MULTI_STATUS = 207 -HTTP_MULTIPLE_CHOICES = 300 -HTTP_MOVED_PERMANENTLY = 301 -HTTP_MOVED_TEMPORARILY = 302 -HTTP_SEE_OTHER = 303 -HTTP_NOT_MODIFIED = 304 -HTTP_USE_PROXY = 305 -HTTP_TEMPORARY_REDIRECT = 307 -HTTP_BAD_REQUEST = 400 -HTTP_UNAUTHORIZED = 401 -HTTP_PAYMENT_REQUIRED = 402 -HTTP_FORBIDDEN = 403 -HTTP_NOT_FOUND = 404 -HTTP_METHOD_NOT_ALLOWED = 405 -HTTP_NOT_ACCEPTABLE = 406 -HTTP_PROXY_AUTHENTICATION_REQUIRED = 407 -HTTP_REQUEST_TIME_OUT = 408 -HTTP_CONFLICT = 409 -HTTP_GONE = 410 -HTTP_LENGTH_REQUIRED = 411 -HTTP_PRECONDITION_FAILED = 412 -HTTP_REQUEST_ENTITY_TOO_LARGE = 413 -HTTP_REQUEST_URI_TOO_LARGE = 414 -HTTP_UNSUPPORTED_MEDIA_TYPE = 415 -HTTP_RANGE_NOT_SATISFIABLE = 416 -HTTP_EXPECTATION_FAILED = 417 -HTTP_UNPROCESSABLE_ENTITY = 422 -HTTP_LOCKED = 423 -HTTP_FAILED_DEPENDENCY = 424 -HTTP_UPGRADE_REQUIRED = 426 -HTTP_INTERNAL_SERVER_ERROR = 500 -HTTP_NOT_IMPLEMENTED = 501 -HTTP_BAD_GATEWAY = 502 -HTTP_SERVICE_UNAVAILABLE = 503 -HTTP_GATEWAY_TIME_OUT = 504 -HTTP_VERSION_NOT_SUPPORTED = 505 -HTTP_VARIANT_ALSO_VARIES = 506 -HTTP_INSUFFICIENT_STORAGE = 507 -HTTP_NOT_EXTENDED = 510 - - -def status_with_reason(code): - # type: (int) -> str - if code == HTTP_OK: - return '200 OK' - if code == HTTP_MOVED_TEMPORARILY: - return '301 Moved Permanently' - if code == HTTP_MOVED_PERMANENTLY: - return '302 Found' - if code == HTTP_NOT_MODIFIED: - return '304 Not Modified' - if code == HTTP_INTERNAL_SERVER_ERROR: - return '500 Internal Server Error' - if code == HTTP_NOT_FOUND: - return '404 Not Found' - return str(code) diff --git a/web/app/index.wsgi b/web/app/index.wsgi index 6f62693..6ae66a0 100644 --- a/web/app/index.wsgi +++ b/web/app/index.wsgi @@ -24,6 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +import httplib import os import traceback @@ -43,7 +44,6 @@ import cmk.gui.login as login import cmk.gui.log as log import cmk.gui.htmllib import cmk.gui.http -import cmk.gui.http_status import cmk.gui.globals from cmk.gui.log import logger from cmk.gui.i18n import _ @@ -130,9 +130,9 @@ class Application(object): # Some exception need to set a specific HTTP status code if ty == MKUnauthenticatedException: - html.response.set_status_code(cmk.gui.http_status.HTTP_UNAUTHORIZED) + html.response.set_status_code(httplib.UNAUTHORIZED) elif ty == livestatus.MKLivestatusException: - html.response.set_status_code(cmk.gui.http_status.HTTP_BAD_GATEWAY) + html.response.set_status_code(httplib.BAD_GATEWAY) if ty in [MKConfigError, MKGeneralException]: logger.error(_("%s: %s") % (plain_title, e))

5 years, 5 months

Plugging is always balanced now.

by Sven Panne

Module: check_mk Branch: master Commit: 47c4260509bb0a8b2aeeb26d0d46e94946f1762b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=47c4260509bb0a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jan 3 13:02:52 2019 +0100 Plugging is always balanced now. Change-Id: If5872d6e8ad810ad93fb8223f8e67301eef3e9fd --- cmk/gui/htmllib.py | 27 ++++----------------------- web/app/index.wsgi | 4 ---- 2 files changed, 4 insertions(+), 27 deletions(-) diff --git a/cmk/gui/htmllib.py b/cmk/gui/htmllib.py index 775b7cb..8e5da06 100644 --- a/cmk/gui/htmllib.py +++ b/cmk/gui/htmllib.py @@ -400,21 +400,15 @@ 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() + self.plug_text.append([]) try: yield - except Exception: - self.drain() - raise finally: - self.unplug() - - # Put in a plug which stops the text stream and redirects it to a sink. - def plug(self): - self.plug_text.append([]) + text = self.drain() + self.plug_text.pop() + self.write(text) def _is_plugged(self): return bool(self.plug_text) @@ -428,19 +422,6 @@ class OutputFunnel(object): self.plug_text.append([]) return text - def unplug(self): - if not self._is_plugged(): # TODO: Raise exception or even remove "if"? - return - - 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() - #. # .--HTML Generator------------------------------------------------------. diff --git a/web/app/index.wsgi b/web/app/index.wsgi index 89e1d44..43d73e5 100644 --- a/web/app/index.wsgi +++ b/web/app/index.wsgi @@ -109,9 +109,6 @@ class Application(object): livestatus.MKLivestatusException, ), e: # TODO: Refactor all the special cases handled here to simplify the exception handling - - html.unplug_all() - ty = type(e) if ty == livestatus.MKLivestatusNotFoundError: title = _("Data not found") @@ -141,7 +138,6 @@ class Application(object): logger.error(_("%s: %s") % (plain_title, e)) except Exception, e: - html.unplug_all() logger.exception() if self._plain_error(): html.set_output_format("text")

5 years, 5 months

Do not build closures by hand. ;-)

by Sven Panne

Module: check_mk Branch: master Commit: 57936740054798f2571089f071485a9dc0652e9e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=57936740054798… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jan 3 12:53:57 2019 +0100 Do not build closures by hand. ;-) Change-Id: I9150e2a37175ae4a1f38724b236057d8853699bd --- cmk/gui/table.py | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/cmk/gui/table.py b/cmk/gui/table.py index 21d1c35..a179cc0 100644 --- a/cmk/gui/table.py +++ b/cmk/gui/table.py @@ -68,8 +68,7 @@ def table_element(table_id=None, title=None, **kwargs): class Table(object): def __init__(self, table_id=None, title=None, **kwargs): super(Table, self).__init__() - self.next_func = id - self.next_args = None + self.next_func = lambda: None self.next_header = None # Use our pagename as table id if none is specified @@ -106,22 +105,18 @@ class Table(object): def row(self, *posargs, **kwargs): self._finish_previous() - self.next_func = self._add_row - self.next_args = posargs, kwargs + self.next_func = lambda: self._add_row(*posargs, **kwargs) def text_cell(self, *args, **kwargs): - kwargs["escape_text"] = True - self.cell(*args, **kwargs) + self.cell(*args, escape_text=True, **kwargs) def cell(self, *posargs, **kwargs): self._finish_previous() - self.next_func = self._add_cell - self.next_args = posargs, kwargs + self.next_func = lambda: self._add_cell(*posargs, **kwargs) def _finish_previous(self): - if self.next_args is not None: - self.next_func(*self.next_args[0], **self.next_args[1]) - self.next_func = None + self.next_func() + self.next_func = lambda: None def _add_row(self, css=None, state=0, collect_headers=True, fixed=False, **attrs): if self.next_header:

5 years, 5 months

Table handling uses plugged() now instead of plug()/unplug().

by Sven Panne

Module: check_mk Branch: master Commit: f5c065fc1c5f6ca8264ba866bd7c12aaf9792caf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f5c065fc1c5f6c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jan 3 12:36:12 2019 +0100 Table handling uses plugged() now instead of plug()/unplug(). Alas, we had to separate the context manager from the table class again. This is a side effect of our arcance "plugging technology"... :-/ Change-Id: I9485c1d38dd15d5a0c4d36fde30f252dc4063e02 --- cmk/gui/backup.py | 8 ++++---- cmk/gui/key_mgmt.py | 4 ++-- cmk/gui/logwatch.py | 4 ++-- cmk/gui/notifications.py | 4 ++-- cmk/gui/pagetypes.py | 4 ++-- cmk/gui/plugins/dashboard/notify_users.py | 5 +++-- cmk/gui/plugins/views/availability.py | 11 ++++++----- cmk/gui/plugins/views/layouts.py | 4 ++-- cmk/gui/plugins/wato/bi.py | 10 +++++----- cmk/gui/plugins/wato/utils/simple_modes.py | 4 ++-- cmk/gui/table.py | 25 +++++++++++++++---------- cmk/gui/visuals.py | 4 ++-- cmk/gui/wato/__init__.py | 2 +- cmk/gui/wato/mkeventd.py | 8 ++++---- cmk/gui/wato/pages/activate_changes.py | 8 +++++--- cmk/gui/wato/pages/analyze_configuration.py | 4 ++-- cmk/gui/wato/pages/audit_log.py | 4 ++-- cmk/gui/wato/pages/bulk_import.py | 4 ++-- cmk/gui/wato/pages/check_catalog.py | 4 ++-- cmk/gui/wato/pages/custom_attributes.py | 4 ++-- cmk/gui/wato/pages/folders.py | 4 ++-- cmk/gui/wato/pages/groups.py | 4 ++-- cmk/gui/wato/pages/host_tags.py | 6 +++--- cmk/gui/wato/pages/icons.py | 4 ++-- cmk/gui/wato/pages/ldap.py | 6 +++--- cmk/gui/wato/pages/notifications.py | 10 +++++----- cmk/gui/wato/pages/pattern_editor.py | 4 ++-- cmk/gui/wato/pages/roles.py | 6 +++--- cmk/gui/wato/pages/rulesets.py | 4 ++-- cmk/gui/wato/pages/services.py | 4 ++-- cmk/gui/wato/pages/sites.py | 4 ++-- cmk/gui/wato/pages/timeperiods.py | 5 +++-- cmk/gui/wato/pages/users.py | 4 ++-- cmk/gui/werks.py | 4 ++-- tests/unit/cmk/gui/test_table.py | 18 +++++++++--------- 35 files changed, 111 insertions(+), 101 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f5c065fc1c…

5 years, 5 months

Make the Table class a context manager.

by Sven Panne

Module: check_mk Branch: master Commit: 1470393089dcc3373bec51ed48acd26c49ed0307 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1470393089dcc3… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jan 3 10:52:11 2019 +0100 Make the Table class a context manager. Change-Id: I8154d6123a537a0d53329539ef9abdc2a310cc02 --- cmk/gui/backup.py | 8 ++++---- cmk/gui/key_mgmt.py | 5 ++--- cmk/gui/logwatch.py | 4 ++-- cmk/gui/notifications.py | 4 ++-- cmk/gui/pagetypes.py | 4 ++-- cmk/gui/plugins/dashboard/notify_users.py | 5 ++--- cmk/gui/plugins/views/availability.py | 11 +++++------ cmk/gui/plugins/views/layouts.py | 4 ++-- cmk/gui/plugins/wato/bi.py | 10 +++++----- cmk/gui/plugins/wato/utils/simple_modes.py | 6 +++--- cmk/gui/table.py | 18 ++++-------------- cmk/gui/visuals.py | 4 ++-- cmk/gui/wato/__init__.py | 2 +- cmk/gui/wato/mkeventd.py | 9 ++++----- cmk/gui/wato/pages/activate_changes.py | 8 +++----- cmk/gui/wato/pages/analyze_configuration.py | 4 ++-- cmk/gui/wato/pages/audit_log.py | 4 ++-- cmk/gui/wato/pages/bulk_import.py | 4 ++-- cmk/gui/wato/pages/check_catalog.py | 5 ++--- cmk/gui/wato/pages/custom_attributes.py | 4 ++-- cmk/gui/wato/pages/folders.py | 4 ++-- cmk/gui/wato/pages/groups.py | 4 ++-- cmk/gui/wato/pages/host_tags.py | 6 +++--- cmk/gui/wato/pages/icons.py | 4 ++-- cmk/gui/wato/pages/ldap.py | 6 +++--- cmk/gui/wato/pages/notifications.py | 11 +++++------ cmk/gui/wato/pages/pattern_editor.py | 5 ++--- cmk/gui/wato/pages/roles.py | 6 +++--- cmk/gui/wato/pages/rulesets.py | 4 ++-- cmk/gui/wato/pages/services.py | 5 ++--- cmk/gui/wato/pages/sites.py | 4 ++-- cmk/gui/wato/pages/timeperiods.py | 5 ++--- cmk/gui/wato/pages/users.py | 5 ++--- cmk/gui/werks.py | 4 ++-- tests/unit/cmk/gui/test_table.py | 18 +++++++++--------- 35 files changed, 96 insertions(+), 118 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1470393089…

5 years, 5 months

Made non-public parts of Table, well, non-public...

by Sven Panne

Module: check_mk Branch: master Commit: 40f04edb83aab15a599e5b23ad1683ed2a270110 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=40f04edb83aab1… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jan 3 11:35:18 2019 +0100 Made non-public parts of Table, well, non-public... Change-Id: Iff7c951b1a0eafccc9c266977faec380bf331837 --- cmk/gui/table.py | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/cmk/gui/table.py b/cmk/gui/table.py index 3b1da3b..b0fb369 100644 --- a/cmk/gui/table.py +++ b/cmk/gui/table.py @@ -94,8 +94,8 @@ class Table(object): html.plug() def row(self, *posargs, **kwargs): - self.finish_previous() - self.next_func = self.add_row + self._finish_previous() + self.next_func = self._add_row self.next_args = posargs, kwargs def text_cell(self, *args, **kwargs): @@ -103,16 +103,16 @@ class Table(object): self.cell(*args, **kwargs) def cell(self, *posargs, **kwargs): - self.finish_previous() - self.next_func = self.add_cell + self._finish_previous() + self.next_func = self._add_cell self.next_args = posargs, kwargs - def finish_previous(self): + def _finish_previous(self): if self.next_args is not None: self.next_func(*self.next_args[0], **self.next_args[1]) self.next_func = None - def add_row(self, css=None, state=0, collect_headers=True, fixed=False, **attrs): + def _add_row(self, css=None, state=0, collect_headers=True, fixed=False, **attrs): if self.next_header: self.rows.append((self.next_header, None, "header", True, attrs)) self.next_header = None @@ -125,14 +125,14 @@ class Table(object): elif not collect_headers and self.options["collect_headers"] is True: self.options["collect_headers"] = False - def add_cell(self, - title="", - text="", - css=None, - help_txt=None, - colspan=None, - sortable=True, - escape_text=False): + def _add_cell(self, + title="", + text="", + css=None, + help_txt=None, + colspan=None, + sortable=True, + escape_text=False): if escape_text: text = html.permissive_attrencode(text) else: @@ -162,7 +162,7 @@ class Table(object): return self def __exit__(self, exc_type, exc_val, exc_tb): - self.finish_previous() + self._finish_previous() html.unplug() if not self.rows and self.options["omit_if_empty"]:

5 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2019