Module: check_mk
Branch: master
Commit: 90e469f153786642265d17380402680b14b7449d
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90e469f1537866…
Author: Óscar Nájera <on(a)mathias-kettner.de>
Date: Thu Nov 15 14:52:17 2018 +0100
Enable pylint unidiomatic-typecheck
CMK-837
Change-Id: Ibefcc60f7cfbcdbd66ec923e382642c2239c59bc
---
.pylintrc | 5 -----
cmk/gui/plugins/metrics/utils.py | 2 +-
cmk/gui/plugins/watolib/utils.py | 2 +-
inventory/dmidecode | 4 ++--
4 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/.pylintrc b/.pylintrc
index 9aa44c0..c4135ec 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -34,11 +34,6 @@ disable=
# duplication (introduce new classes, combine methods, etc.)
attribute-defined-outside-init,
#---------------------------------------------------------------------------
- # Enabling this would be very desirable, using type() instead of
- # isinstance() is a very bad idea most of the time, as it totally ignores
- # class hierarchies, breaking things in subtle ways.
- unidiomatic-typecheck,
- #---------------------------------------------------------------------------
# This should really be fixed: Global variables are already a bad idea, but
# depending on an implicit protocol to create them is an even worse one.
global-variable-undefined,
diff --git a/cmk/gui/plugins/metrics/utils.py b/cmk/gui/plugins/metrics/utils.py
index e06d8fb..bdb5ce1 100644
--- a/cmk/gui/plugins/metrics/utils.py
+++ b/cmk/gui/plugins/metrics/utils.py
@@ -318,7 +318,7 @@ def translate_metrics(perf_data, check_command):
# relevant when fetching RRD data and is used for selecting
# the consolidation function MAX.
def evaluate(expression, translated_metrics):
- if type(expression) in (float, int):
+ if isinstance(expression, (float, int)):
return _evaluate_literal(expression, translated_metrics)
else:
if "#" in expression:
diff --git a/cmk/gui/plugins/watolib/utils.py b/cmk/gui/plugins/watolib/utils.py
index 1834bf0..5e9a40d 100644
--- a/cmk/gui/plugins/watolib/utils.py
+++ b/cmk/gui/plugins/watolib/utils.py
@@ -189,7 +189,7 @@ def register_configvar(group,
# New API is to hand over the class via domain argument. But not all calls have been
# migrated. Perform the translation here.
- if type(domain) in [str, unicode]:
+ if isinstance(domain, basestring):
domain = ConfigDomain.get_class(domain)
_configvar_groups.setdefault(group, []).append((domain, varname, valuespec))
diff --git a/inventory/dmidecode b/inventory/dmidecode
index b47adfa..bb998da 100644
--- a/inventory/dmidecode
+++ b/inventory/dmidecode
@@ -273,14 +273,14 @@ def inv_dmidecode_parse_mem_device(lines):
def inv_dmidecode_parse_generic(node, lines, keyinfo):
- if type(node) == str:
+ if isinstance(node, str):
node = inv_tree(node)
for line in lines:
if line[0] in keyinfo:
key = keyinfo[line[0]]
if line[1] != "Not Specified":
value = line[1]
- if type(key) == tuple:
+ if isinstance(key, tuple):
key, transform = key
value = transform(value)
if value is None:
Module: check_mk
Branch: master
Commit: c26b58f473254d56b532c4f2bd0c6d2c9af5dd61
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c26b58f473254d…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Sun Aug 12 22:21:41 2018 +0200
Cleaned up site context checks
Change-Id: I70f98ae5934a83b45e5073ef2efacdd443dac596
---
omd/packages/omd/omdlib/main.py | 30 ++++++++++++++++++++++++------
tests/unit/omdlib/test_site_context.py | 2 ++
2 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/omd/packages/omd/omdlib/main.py b/omd/packages/omd/omdlib/main.py
index f3ccffe..ad4278a 100644
--- a/omd/packages/omd/omdlib/main.py
+++ b/omd/packages/omd/omdlib/main.py
@@ -2335,7 +2335,7 @@ def call_scripts(phase):
def check_site_user(site, site_must_exist):
- if isinstance(site, RootContext):
+ if not site.is_site_context():
return
if not site_must_exist:
@@ -3170,7 +3170,7 @@ def main_umount(args, options=None):
# if no site is selected, all sites are affected
exit_status = 0
- if not g_site.name:
+ if not g_site.is_site_context():
for site_id in all_sites():
# Set global vars for the current site
g_site = SiteContext(site_id)
@@ -3200,7 +3200,7 @@ def main_init_action(command, args, options=None):
if options is None:
options = {}
- if g_site.name:
+ if g_site.is_site_context():
exit_status = init_action(command, args, options)
# When the whole site is about to be stopped check for remaining
@@ -4035,6 +4035,12 @@ class AbstractSiteContext(object):
raise NotImplementedError()
+ @staticmethod
+ @abc.abstractmethod
+ def is_site_context():
+ raise NotImplementedError()
+
+
class SiteContext(AbstractSiteContext):
@property
@@ -4130,6 +4136,12 @@ class SiteContext(AbstractSiteContext):
return not os.path.exists(apache_conf)
+ @staticmethod
+ def is_site_context():
+ return True
+
+
+
class RootContext(AbstractSiteContext):
def __init__(self):
@@ -4162,6 +4174,12 @@ class RootContext(AbstractSiteContext):
return False
+ @staticmethod
+ def is_site_context():
+ return False
+
+
+
class VersionInfo(object):
"""Provides OMD version/platform specific infos"""
def __init__(self, version):
@@ -4637,7 +4655,7 @@ def main():
# Commands operating on an existing site *must* run omd in
# the same version as the site has! Sole exception: update.
# That command must be run in the target version
- if g_site.name and site_must_exist and command != "update":
+ if g_site.is_site_context() and site_must_exist and command != "update":
v = g_site.version
if v == None: # Site has no home directory or version link
if command == "rm":
@@ -4665,11 +4683,11 @@ def main():
else:
raise
- if not no_suid and g_site.name and is_root() and not only_root:
+ if not no_suid and g_site.is_site_context() and is_root() and not only_root:
switch_to_site_user()
# Make sure environment is in a defined state
- if g_site.name:
+ if g_site.is_site_context():
clear_environment()
set_environment()
diff --git a/tests/unit/omdlib/test_site_context.py b/tests/unit/omdlib/test_site_context.py
index 0fa6658..da2852e 100644
--- a/tests/unit/omdlib/test_site_context.py
+++ b/tests/unit/omdlib/test_site_context.py
@@ -7,6 +7,7 @@ def test_root_context():
site = omdlib.main.RootContext()
assert site.name == None
assert site.dir == "/"
+ assert not site.is_site_context()
def test_site_context(monkeypatch):
@@ -14,6 +15,7 @@ def test_site_context(monkeypatch):
assert site.name == "dingeling"
assert site.dir == "/omd/sites/dingeling"
assert site.tmp_dir == "/omd/sites/dingeling/tmp"
+ assert site.is_site_context()
def test_site_context_version(monkeypatch):
