[checkmk-commits] Fix invalid set_http_header() calls

Module: check_mk Branch: master Commit: 0e766f0759e9df5c7d39f5c9c009acf738b88a98 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0e766f0759e9df… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 24 15:46:04 2018 +0200 Fix invalid set_http_header() calls This method has been refactored. The issue should've been found by pylint, but it is trapped by the __getattr__ magic of the htmllib which is used for dynamically creating the html tag building functions. Change-Id: I5b13b7bed651c1e6388be71e2815becf8d398bdd --- cmk/gui/crash_reporting.py | 4 ++-- cmk/gui/key_mgmt.py | 4 ++-- cmk/gui/login.py | 2 +- cmk/gui/wato/__init__.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmk/gui/crash_reporting.py b/cmk/gui/crash_reporting.py index a9cd960..7598edd 100644 --- a/cmk/gui/crash_reporting.py +++ b/cmk/gui/crash_reporting.py @@ -486,6 +486,6 @@ def page_download_crash_report(): (html.urlencode(host), html.urlencode(service), time.strftime("%Y-%m-%d_%H-%M-%S")) tardata = get_crash_report_archive_as_string(site, host, service) - html.set_http_header('Content-Disposition', 'Attachment; filename=%s' % filename) - html.set_http_header('Content-Type', 'application/x-tar') + html.response.set_http_header('Content-Disposition', 'Attachment; filename=%s' % filename) + html.response.set_http_header('Content-Type', 'application/x-tar') html.write(tardata) diff --git a/cmk/gui/key_mgmt.py b/cmk/gui/key_mgmt.py index 4477918..d796a75 100644 --- a/cmk/gui/key_mgmt.py +++ b/cmk/gui/key_mgmt.py @@ -450,9 +450,9 @@ class PageDownloadKey(object): def _send_download(self, keys, key_id): key = keys[key_id] - html.set_http_header("Content-Disposition","Attachment; filename=%s" % + html.response.set_http_header("Content-Disposition","Attachment; filename=%s" % self._file_name(key_id, key)) - html.set_http_header("Content-type", "application/x-pem-file") + html.response.set_http_header("Content-type", "application/x-pem-file") html.write(key["private_key"]) html.write(key["certificate"]) diff --git a/cmk/gui/login.py b/cmk/gui/login.py index 1c65e1b..f342f03 100644 --- a/cmk/gui/login.py +++ b/cmk/gui/login.py @@ -503,7 +503,7 @@ def page_logout(): else: # Implement HTTP logout with cookie hack if not html.request.has_cookie('logout'): - html.set_http_header('WWW-Authenticate', 'Basic realm="OMD Monitoring Site %s"' % config.omd_site()) + 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) else: diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index 47f034e..637ae62 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -14182,7 +14182,7 @@ class PageDownloadAgentOutput(AgentOutputPage): file_name = self.file_name(self._host.site_id(), self._host.name(), self._ty) html.set_output_format("text") - html.set_http_header("Content-Disposition", "Attachment; filename=%s" % file_name) + html.response.set_http_header("Content-Disposition", "Attachment; filename=%s" % file_name) preview_filepath = os.path.join(self._job.get_work_dir(), file_name) html.write(file(preview_filepath).read())