Module: check_mk
Branch: master
Commit: 22dc1584ff33051e2d0fbd2ff7f04c137cef6cc8
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=22dc1584ff3305…
Author: Óscar Nájera <on(a)mathias-kettner.de>
Date: Thu Nov 8 16:38:09 2018 +0100
Fix typecheck idiom in cmk/gui/plugins/{sidebar,wato}
CMK-837
Change-Id: Icb2c2ff26e290d37e468fdff56a79eaa2c819616
---
cmk/gui/plugins/sidebar/quicksearch.py | 2 +-
cmk/gui/plugins/sidebar/shipped.py | 6 +++---
cmk/gui/plugins/sidebar/virtual_host_tree.py | 2 +-
cmk/gui/plugins/wato/utils/__init__.py | 8 ++++----
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/cmk/gui/plugins/sidebar/quicksearch.py
b/cmk/gui/plugins/sidebar/quicksearch.py
index fe96091..90f4eaf 100644
--- a/cmk/gui/plugins/sidebar/quicksearch.py
+++ b/cmk/gui/plugins/sidebar/quicksearch.py
@@ -773,7 +773,7 @@ class GroupMatchPlugin(QuicksearchMatchPlugin):
else:
value = used_filters.get(self.get_filter_shortname())
- if type(value) == list:
+ if isinstance(value, list):
value = "|".join(value)
return value, [(filter_name, value)]
diff --git a/cmk/gui/plugins/sidebar/shipped.py b/cmk/gui/plugins/sidebar/shipped.py
index 191edc7..0955754 100644
--- a/cmk/gui/plugins/sidebar/shipped.py
+++ b/cmk/gui/plugins/sidebar/shipped.py
@@ -351,7 +351,7 @@ def render_nagios():
("extinfo.cgi?type=7", "Scheduling Queue"),
("config.cgi", "Configuration"),
]:
- if type(entry) == str:
+ if isinstance(entry, str):
html.close_ul()
heading(entry)
html.open_ul()
@@ -401,14 +401,14 @@ def render_custom_links():
for entry in links:
n += 1
try:
- if type(entry[1]) == type(True):
+ if isinstance(entry[1], type(True)):
idss = ids + [str(n)]
id_ = '/'.join(idss)
html.begin_foldable_container(
"customlinks", id_, isopen=entry[1], title=entry[0])
render_list(idss, entry[2])
html.end_foldable_container()
- elif type(entry[1]) == str:
+ elif isinstance(entry[1], str):
frame = entry[3] if len(entry) > 3 else "main"
if len(entry) > 2 and entry[2]:
diff --git a/cmk/gui/plugins/sidebar/virtual_host_tree.py
b/cmk/gui/plugins/sidebar/virtual_host_tree.py
index 5e2413a..17c122a 100644
--- a/cmk/gui/plugins/sidebar/virtual_host_tree.py
+++ b/cmk/gui/plugins/sidebar/virtual_host_tree.py
@@ -53,7 +53,7 @@ class VirtualHostTree(SidebarSnapin):
def _load_user_settings(self):
tree_conf = config.user.load_file("virtual_host_tree",
{"tree": 0, "cwd": {}})
- if type(tree_conf) == int:
+ if isinstance(tree_conf, int):
tree_conf = {"tree": tree_conf, "cwd": {}} # convert
from old style
tree_id = tree_conf["tree"]
diff --git a/cmk/gui/plugins/wato/utils/__init__.py
b/cmk/gui/plugins/wato/utils/__init__.py
index a0d77cd..cce3bd4 100644
--- a/cmk/gui/plugins/wato/utils/__init__.py
+++ b/cmk/gui/plugins/wato/utils/__init__.py
@@ -506,7 +506,7 @@ def _translation_elements(what):
add_label = _("Add expression"),
movable = False,
),
- forth = lambda x: type(x) == tuple and [x] or x,
+ forth = lambda x: isinstance(x, tuple) and [x] or x,
)
),
( "mapping",
@@ -591,7 +591,7 @@ class PasswordFromStore(CascadingDropdown):
def IndividualOrStoredPassword(*args, **kwargs):
return Transform(
PasswordFromStore(*args, **kwargs),
- forth=lambda v: ("password", v) if type(v) != tuple else v,
+ forth=lambda v: ("password", v) if not isinstance(v, tuple) else v,
)
@@ -957,9 +957,9 @@ def PredictiveLevels(**args):
# prediction
def Levels(**kwargs):
def match_levels_alternative(v):
- if type(v) == dict:
+ if isinstance(v, dict):
return 2
- elif type(v) == tuple and v != (None, None):
+ elif isinstance(v, tuple) and v != (None, None):
return 1
return 0