Module: check_mk
Branch: master
Commit: 44ee0260bed289210ba10599f6a9e855cd876e34
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44ee0260bed289…
Author: Óscar Nájera <on(a)mathias-kettner.de>
Date: Thu Nov 8 13:52:24 2018 +0100
Typecheck idiom on cmk/gui/plugins/{dashboard,visuals}
CMK-837
Change-Id: I10c3876d8d32857b4b53c832e1e84ebb8bd8c669
---
cmk/gui/plugins/dashboard/utils.py | 2 +-
cmk/gui/plugins/visuals/filters.py | 6 +++---
cmk/gui/plugins/visuals/inventory.py | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/cmk/gui/plugins/dashboard/utils.py b/cmk/gui/plugins/dashboard/utils.py
index 80ac2b9..db8c173 100644
--- a/cmk/gui/plugins/dashboard/utils.py
+++ b/cmk/gui/plugins/dashboard/utils.py
@@ -303,7 +303,7 @@ class Dashlet(object):
return None
urlfunc = self._dashlet_spec['urlfunc']
- if type(urlfunc) == type(lambda x: x):
+ if callable(urlfunc):
return urlfunc()
if '.' in urlfunc:
diff --git a/cmk/gui/plugins/visuals/filters.py b/cmk/gui/plugins/visuals/filters.py
index bb5bc7a..30c49b9 100644
--- a/cmk/gui/plugins/visuals/filters.py
+++ b/cmk/gui/plugins/visuals/filters.py
@@ -86,7 +86,7 @@ class FilterText(Filter):
negate = ""
if current_value:
- if type(current_value) == unicode:
+ if isinstance(current_value, unicode):
current_value = current_value.encode("utf-8")
return "Filter: %s %s%s %s\n" % (
self.column,
@@ -127,7 +127,7 @@ class FilterHostnameOrAlias(FilterUnicode):
negate = ""
if current_value:
- if type(current_value) == unicode:
+ if isinstance(current_value, unicode):
current_value = current_value.encode("utf-8")
return "Filter: host_name %s%s %s\nFilter: alias %s%s %s\nOr: 2\n"
% ((
negate,
@@ -1694,7 +1694,7 @@ if config.mkeventd_enabled:
self._operator = operator
def display(self):
- if type(self._choices) == list:
+ if isinstance(self._choices, list):
choices = self._choices
else:
choices = self._choices()
diff --git a/cmk/gui/plugins/visuals/inventory.py b/cmk/gui/plugins/visuals/inventory.py
index ffe5d32..cec8b1d 100644
--- a/cmk/gui/plugins/visuals/inventory.py
+++ b/cmk/gui/plugins/visuals/inventory.py
@@ -527,7 +527,7 @@ class FilterInvHasSoftwarePackage(Filter):
def find_package(self, packages, name, from_version, to_version):
for package in packages:
- if type(name) == unicode:
+ if isinstance(name, unicode):
if package["name"] != name:
continue
else: