Module: check_mk
Branch: master
Commit: c18d6cd928244a02ea3c16191d209bcbb3ff53f7
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c18d6cd928244a…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Feb 7 11:55:19 2017 +0100
Fixed linter issues
Change-Id: I6e26dff45ed3ab17e3a73b08cc17ff8d4e5336fe
---
bin/mkbench | 5 +++--
cmk_base/cee | 2 +-
tests/pylint/test_pylint_checks.py | 2 +-
tests/testlib/pylint_cmk.py | 2 +-
web/plugins/wato/mkeventd.py | 2 +-
5 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/bin/mkbench b/bin/mkbench
index e2e371b..876280c 100755
--- a/bin/mkbench
+++ b/bin/mkbench
@@ -71,8 +71,9 @@ import traceback
import logging
import multiprocessing
-import psutil
-import npyscreen
+# TODO: Remove the disablings below once the builds ship these modules
+import psutil # pylint: disable=import-error
+import npyscreen # pylint: disable=import-error
from collections import namedtuple
diff --git a/cmk_base/cee b/cmk_base/cee
index 8c843cc..bcc1fe3 120000
--- a/cmk_base/cee
+++ b/cmk_base/cee
@@ -1 +1 @@
-../../cmc/cmk_base/cee
\ No newline at end of file
+../enterprise/cmk_base/cee
\ No newline at end of file
diff --git a/tests/pylint/test_pylint_checks.py b/tests/pylint/test_pylint_checks.py
index 43ad6b0..c4ab1d8 100755
--- a/tests/pylint/test_pylint_checks.py
+++ b/tests/pylint/test_pylint_checks.py
@@ -5,7 +5,7 @@ import os
import sys
import pytest
-from testlib import repo_path
+from testlib import repo_path, cmc_path
import testlib.pylint_cmk as pylint_cmk
# Mark all tests in this file to be pylint checks
diff --git a/tests/testlib/pylint_cmk.py b/tests/testlib/pylint_cmk.py
index 14168aa..7ad92bb 100644
--- a/tests/testlib/pylint_cmk.py
+++ b/tests/testlib/pylint_cmk.py
@@ -11,7 +11,7 @@ import tempfile
from pylint.reporters.text import ColorizedTextReporter, ParseableTextReporter
from pylint.utils import Message
-from testlib import repo_path
+from testlib import repo_path, cmk_path, cmc_path
def ordered_module_files():
diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py
index 983d0d8..4d2ee18 100644
--- a/web/plugins/wato/mkeventd.py
+++ b/web/plugins/wato/mkeventd.py
@@ -1764,7 +1764,7 @@ def mode_mkeventd_config(phase):
msg = _("Changed Configuration variable %s to %s.") % (varname,
current_settings[varname] and _("on") or _("off"))
- save_configuration_settings(current_settings)
+ save_global_settings(current_settings)
add_ec_change("edit-configvar", msg)