[checkmk-commits] Fixed and enabled simplifiable-if-statement warnings.

Module: check_mk Branch: master Commit: de4f12ce9596671536b5d7baae67724f73dd02d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de4f12ce959667… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jul 13 10:32:50 2018 +0200 Fixed and enabled simplifiable-if-statement warnings. Change-Id: I410f0f8daf91d8d3770e9304b6525efdbd828c4f --- cmk/gui/htmllib.py | 5 +---- cmk/gui/valuespec.py | 10 ++-------- tests/pylint/pylintrc | 3 +-- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/cmk/gui/htmllib.py b/cmk/gui/htmllib.py index 307c701..79f6f10 100644 --- a/cmk/gui/htmllib.py +++ b/cmk/gui/htmllib.py @@ -977,10 +977,7 @@ class TransactionManager(object): return False # Now check, if this id is a valid one - if id in self._load_transids(): - return True - else: - return False + return id in self._load_transids() def is_transaction(self): diff --git a/cmk/gui/valuespec.py b/cmk/gui/valuespec.py index cc2a5db..b2e38bc 100644 --- a/cmk/gui/valuespec.py +++ b/cmk/gui/valuespec.py @@ -1540,10 +1540,7 @@ class Checkbox(ValueSpec): return self._true_label if value else self._false_label def from_html_vars(self, varprefix): - if html.var(varprefix): - return True - else: - return False + return bool(html.var(varprefix)) def validate_datatype(self, value, varprefix): if type(value) != bool: @@ -3067,10 +3064,7 @@ class OptionalEdit(Optional): div_id = "option_" + varprefix checked = html.get_checkbox(varprefix + "_use") if checked == None: - if self._negate: - checked = True - else: - checked = False + checked = self._negate html.open_span() diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index c4e80d4..1b5807c 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -77,9 +77,8 @@ disable= wrong-import-order, wrong-import-position, #--------------------------------------------------------------------------- - # The 4 warnings below have already been fixed for non-web/ code. When the + # The 3 warnings below have already been fixed for non-web/ code. When the # upcoming reorganization of web/ has been landed, these should be fixed first. - simplifiable-if-statement, unnecessary-lambda, unnecessary-pass, useless-super-delegation,