Checkmk git commits July 2018

checkmk-commits@lists.checkmk.com

10 participants
467 discussions

Fixed and enabled blacklisted-name warnings.

by Sven Panne

Module: check_mk Branch: master Commit: b9ac8d1703d9df0b37486b9fb442507b0246ca78 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b9ac8d1703d9df… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jul 13 14:31:31 2018 +0200 Fixed and enabled blacklisted-name warnings. Change-Id: I9840c85e4a3a3fd3a9d626fb50d3f8b1a9414ded --- cmk/gui/plugins/views/commands.py | 2 +- tests/pylint/pylintrc | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/cmk/gui/plugins/views/commands.py b/cmk/gui/plugins/views/commands.py index d2a6780..8b0eee3 100644 --- a/cmk/gui/plugins/views/commands.py +++ b/cmk/gui/plugins/views/commands.py @@ -893,7 +893,7 @@ def command_star(cmdtag, spec, row): def command_executor_star(command, site): - foo, star, spec = command.split(";", 2) + _unused, star, spec = command.split(";", 2) stars = config.user.load_stars() if star == "0" and spec in stars: stars.remove(spec) diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index efbed2e..cafe9aa 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -18,7 +18,6 @@ disable= bad-indentation, bad-whitespace, bare-except, - blacklisted-name, broad-except, c-extension-no-member, cell-var-from-loop,

6 years, 2 months

Comment unused-variable warning.

by Sven Panne

Module: check_mk Branch: master Commit: 4c229a0358a13365a437823d25f9317c1e61dc29 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c229a0358a133… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jul 13 14:18:21 2018 +0200 Comment unused-variable warning. Change-Id: Iadf897224e8c1a39d454cd8c382d9ad0ac8218f2 --- tests/pylint/pylintrc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index a03cda2..efbed2e 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -70,16 +70,20 @@ disable= unsupported-membership-test, unused-argument, unused-import, - unused-variable, unused-wildcard-import, wildcard-import, wrong-import-order, wrong-import-position, #--------------------------------------------------------------------------- - # We should really enable this, but some work is needed to sprinkle abc - # annotations through our code and fix a few obscure places. + # We should really enable this, there could be some real exceptions waiting + # to be thrown. But some work is needed first to sprinkle abc annotations + # through our code and fix a few obscure places. abstract-method, #--------------------------------------------------------------------------- + # We should really enable this, there could be some typos hiding which are + # real bugs. Just some work to do... + unused-variable, + #--------------------------------------------------------------------------- # Enabling the two spelling-related checks increases pylints runtime from # 11 min to 40 min, so we better keep those disabled for normal runs. # wrong-spelling-in-comment,

6 years, 2 months

Comment abstract-method warning.

by Sven Panne

Module: check_mk Branch: master Commit: 96fd16910efd0103230a90d97bfba31efa2d3c01 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96fd16910efd01… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jul 13 13:50:23 2018 +0200 Comment abstract-method warning. Change-Id: If394bcdf8f346e201bd72a95796b29255e269680 --- tests/pylint/pylintrc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index 16be16c..a03cda2 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -12,7 +12,6 @@ persistent=yes [MESSAGES CONTROL] disable= - abstract-method, arguments-differ, attribute-defined-outside-init, bad-continuation, @@ -77,6 +76,10 @@ disable= wrong-import-order, wrong-import-position, #--------------------------------------------------------------------------- + # We should really enable this, but some work is needed to sprinkle abc + # annotations through our code and fix a few obscure places. + abstract-method, + #--------------------------------------------------------------------------- # Enabling the two spelling-related checks increases pylints runtime from # 11 min to 40 min, so we better keep those disabled for normal runs. # wrong-spelling-in-comment,

6 years, 2 months

Fix braino in Werk 6227

by Konstantin Büttner

Module: check_mk Branch: master Commit: 9cd80107f231e0184e6e5a7899549ee19a12a333 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9cd80107f231e0… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Jul 13 13:33:43 2018 +0200 Fix braino in Werk 6227 Change-Id: Ie24749197b688e8e28c08f69f2b1cc2dde45c030 --- cmk/ec/main.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 0a0526e..78b50cc 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -3213,6 +3213,8 @@ def run_eventd(terminate_main_event, settings, config, lock_configuration, histo if is_replication_slave(config) and now > next_replication: replication_pull(settings, config, lock_configuration, perfcounters, event_status, event_server, slave_status, logger) next_replication = now + config["replication"]["interval"] + except MKSignalException as e: + raise e except Exception as e: logger.exception("Exception in main thread:\n%s" % e) if settings.options.debug:

6 years, 2 months

Fixed and enabled useless-super-delegation warnings.

by Sven Panne

Module: check_mk Branch: master Commit: 45e9dcb673407989173fb6aebb42553316f28651 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45e9dcb6734079… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jul 13 12:48:38 2018 +0200 Fixed and enabled useless-super-delegation warnings. Change-Id: I9db58e6c5ddce7a1ddd6ec9f0d80cfc1c5fbbd54 --- cmk/gui/backup.py | 8 -------- cmk/gui/bi.py | 4 ---- cmk/gui/gui_background_job.py | 16 ---------------- cmk/gui/plugins/wato/background_job.py | 8 -------- cmk/gui/wato/__init__.py | 24 ------------------------ cmk/gui/wato/pages/sites.py | 4 ---- cmk/gui/watolib.py | 3 --- tests/pylint/pylintrc | 4 ---- 8 files changed, 71 deletions(-) diff --git a/cmk/gui/backup.py b/cmk/gui/backup.py index f4a54a6..829d459 100644 --- a/cmk/gui/backup.py +++ b/cmk/gui/backup.py @@ -539,10 +539,6 @@ class Jobs(BackupEntityCollection): class PageBackup(object): - def __init__(self): - super(PageBackup, self).__init__() - - def title(self): raise NotImplementedError() @@ -1089,10 +1085,6 @@ class Targets(BackupEntityCollection): class PageBackupTargets(object): - def __init__(self): - super(PageBackupTargets, self).__init__() - - def title(self): raise NotImplementedError() diff --git a/cmk/gui/bi.py b/cmk/gui/bi.py index 3b113cd..b75e94f 100644 --- a/cmk/gui/bi.py +++ b/cmk/gui/bi.py @@ -811,10 +811,6 @@ class BISitedataManager(object): class BIJobManager(object): - def __init__(self): - super(BIJobManager, self).__init__() - - def _get_only_hosts_and_only_groups(self, aggr_ids, only_hosts, only_groups, all_hosts): all_groups = set([]) for (aggr_type, idx, aggr_groups) in aggr_ids: diff --git a/cmk/gui/gui_background_job.py b/cmk/gui/gui_background_job.py index 9031aa5..12b8534 100644 --- a/cmk/gui/gui_background_job.py +++ b/cmk/gui/gui_background_job.py @@ -149,22 +149,6 @@ class GUIBackgroundJobSnapshottedFunctions(background_job.BackgroundJob): return self.get_status().get("user") != config.user.id - def is_running(self): - return super(GUIBackgroundJobSnapshottedFunctions, self).is_running() - - - def exists(self): - return super(GUIBackgroundJobSnapshottedFunctions, self).exists() - - - def get_job_id(self): - return super(GUIBackgroundJobSnapshottedFunctions, self).get_job_id() - - - def get_title(self): - return super(GUIBackgroundJobSnapshottedFunctions, self).get_title() - - class GUIBackgroundJob(GUIBackgroundJobSnapshottedFunctions, background_job.BackgroundJob): _background_process_class = GUIBackgroundProcess diff --git a/cmk/gui/plugins/wato/background_job.py b/cmk/gui/plugins/wato/background_job.py index 744e4b9..b62bebc 100644 --- a/cmk/gui/plugins/wato/background_job.py +++ b/cmk/gui/plugins/wato/background_job.py @@ -47,10 +47,6 @@ register_modules(WatoModule( )) class ModeBackgroundJobsOverview(WatoMode): - def __init__(self): - super(ModeBackgroundJobsOverview, self).__init__() - - @classmethod def name(cls): return "background_jobs_overview" @@ -101,10 +97,6 @@ class ModeBackgroundJobDetails(WatoMode): return [] - def __init__(self): - super(ModeBackgroundJobDetails, self).__init__() - - def title(self): return _("Background job details") diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index 055e2bc..9e82021 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -6345,10 +6345,6 @@ class ModeBackupTargets(backup.PageBackupTargets, WatoMode): return ["backups"] - def __init__(self): - super(ModeBackupTargets, self).__init__() - - def title(self): return _("Site backup targets") @@ -7501,10 +7497,6 @@ class ModeEditGlobalSetting(EditGlobalSettingMode): return ["global"] - def __init__(self): - super(ModeEditGlobalSetting, self).__init__() - - def title(self): return _("Global configuration settings for Check_MK") @@ -7533,10 +7525,6 @@ class ModeEditSiteGlobalSetting(EditGlobalSettingMode): return ["global"] - def __init__(self): - super(ModeEditSiteGlobalSetting, self).__init__() - - def _back_mode(self): return "edit_site_globals" @@ -13536,10 +13524,6 @@ class ModeCloneRule(EditRuleMode): return [] - def __init__(self): - super(ModeCloneRule, self).__init__() - - def _set_rule(self): super(ModeCloneRule, self)._set_rule() @@ -14620,10 +14604,6 @@ def custom_attr_types(): class ModeEditCustomAttr(WatoMode): __metaclass__ = abc.ABCMeta - def __init__(self): - # Note: the base class calls _from_vars - super(ModeEditCustomAttr, self).__init__() - @property def _attrs(self): return self._all_attrs[self._type] @@ -14979,10 +14959,6 @@ class ModeCustomUserAttrs(ModeCustomAttrs): def permissions(cls): return ["users"] - - def __init__(self): - super(ModeCustomUserAttrs, self).__init__() - @property def _type(self): return 'user' diff --git a/cmk/gui/wato/pages/sites.py b/cmk/gui/wato/pages/sites.py index 661d60d..35f08d2 100644 --- a/cmk/gui/wato/pages/sites.py +++ b/cmk/gui/wato/pages/sites.py @@ -71,10 +71,6 @@ class ModeDistributedMonitoring(ModeSites): return ["sites"] - def __init__(self): - super(ModeDistributedMonitoring, self).__init__() - - def title(self): return _("Distributed Monitoring") diff --git a/cmk/gui/watolib.py b/cmk/gui/watolib.py index b0c8f3f..65ffe51 100644 --- a/cmk/gui/watolib.py +++ b/cmk/gui/watolib.py @@ -780,9 +780,6 @@ class ConfigDomainOMD(ConfigDomain): # add, remove mean just modifications in the data structures class WithPermissions(object): - def __init__(self): - super(WithPermissions, self).__init__() - def may(self, how): # how is "read" or "write" return self.user_may(config.user.id, how) diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index 7100c29..16be16c 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -77,10 +77,6 @@ disable= wrong-import-order, wrong-import-position, #--------------------------------------------------------------------------- - # The warning below has already been fixed for non-web/ code. When the - # upcoming reorganization of web/ has been landed, this should be fixed first. - useless-super-delegation, - #--------------------------------------------------------------------------- # Enabling the two spelling-related checks increases pylints runtime from # 11 min to 40 min, so we better keep those disabled for normal runs. # wrong-spelling-in-comment,

6 years, 2 months

Fixed and enabled unnecessary-pass warnings.

by Sven Panne

Module: check_mk Branch: master Commit: eef6fd37a9aa619d7b1238e828c60000f816980a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eef6fd37a9aa61… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jul 13 12:41:34 2018 +0200 Fixed and enabled unnecessary-pass warnings. Change-Id: Ic16f74baf8fa7706af0332df7e353f814046e000 --- cmk/gui/plugins/metrics/utils.py | 1 - tests/pylint/pylintrc | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cmk/gui/plugins/metrics/utils.py b/cmk/gui/plugins/metrics/utils.py index 98b58a4..4981ed9 100644 --- a/cmk/gui/plugins/metrics/utils.py +++ b/cmk/gui/plugins/metrics/utils.py @@ -281,7 +281,6 @@ def translate_metrics(perf_data, check_command): except: if config.debug: raise - pass # empty or invalid number new_entry.update(mi) diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index 89afb96..7100c29 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -77,9 +77,8 @@ disable= wrong-import-order, wrong-import-position, #--------------------------------------------------------------------------- - # The 2 warnings below have already been fixed for non-web/ code. When the - # upcoming reorganization of web/ has been landed, these should be fixed first. - unnecessary-pass, + # The warning below has already been fixed for non-web/ code. When the + # upcoming reorganization of web/ has been landed, this should be fixed first. useless-super-delegation, #--------------------------------------------------------------------------- # Enabling the two spelling-related checks increases pylints runtime from

6 years, 2 months

Make pylint happy again (hopefully)...

by Sven Panne

Module: check_mk Branch: master Commit: e4a9015ddd6fddb9999b54c3b344107eca78f670 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e4a9015ddd6fdd… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jul 13 12:35:50 2018 +0200 Make pylint happy again (hopefully)... Change-Id: Ib709a4928780c5cffecc659c14dc9b4b2efbac73 --- cmk/gui/plugins/wato/check_mk_configuration.py | 10 +++++----- cmk/gui/plugins/wato/check_parameters.py | 4 ++-- cmk/gui/wato/__init__.py | 3 ++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/cmk/gui/plugins/wato/check_mk_configuration.py b/cmk/gui/plugins/wato/check_mk_configuration.py index dd8af81..5a7eaef 100644 --- a/cmk/gui/plugins/wato/check_mk_configuration.py +++ b/cmk/gui/plugins/wato/check_mk_configuration.py @@ -639,7 +639,7 @@ register_configvar(group, totext = _("%d translations"), ), forth = lambda d: sorted(d.items()), - back = lambda l: dict(l), + back = dict, ), domain = "multisite", ) @@ -718,7 +718,7 @@ register_configvar(group, totext = _("%d icons and actions"), ), forth = lambda d: sorted(d.items()), - back = lambda l: dict(l), + back = dict, ), domain = "multisite", ) @@ -809,7 +809,7 @@ register_configvar(group, "change the sorting of the icons."), ), forth = lambda d: sorted(d.items()), - back = lambda l: dict(l), + back = dict, ), domain = "multisite", ) @@ -1929,7 +1929,7 @@ register_rule(group, default_value = 120.0, label = _("Interval:"), unit = _("minutes")), - forth = lambda x: float(x), + forth = float, ), title = _("Periodic notifications during host problems"), help = _("If you enable periodic notifications, then during a problem state " @@ -1952,7 +1952,7 @@ register_rule(group, default_value = 120.0, label = _("Interval:"), unit = _("minutes")), - forth = lambda x: float(x), + forth = float, ), title = _("Periodic notifications during service problems"), help = _("If you enable periodic notifications, then during a problem state " diff --git a/cmk/gui/plugins/wato/check_parameters.py b/cmk/gui/plugins/wato/check_parameters.py index 8411166..f67a48c 100644 --- a/cmk/gui/plugins/wato/check_parameters.py +++ b/cmk/gui/plugins/wato/check_parameters.py @@ -12077,8 +12077,8 @@ vs_elements_if_groups_matches = [ choices = defines.interface_port_types(), help = _("Only interfaces with the given port type are put into this group. " "For example 53 (propVirtual)."), - ), forth = lambda x: str(x), - back = lambda x: int(x), + ), forth = str, + back = int, )), ("items", ListOfStrings( title = _("Restrict interface items"), diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index 3b04fa0..055e2bc 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -16564,7 +16564,8 @@ def configure_attributes(new, hosts, for_what, parent, myself=None, without_attr active = False if not new and (not attr.editable() or not attr.may_edit()): - if active: + # Bug in pylint 1.9.2 https://github.com/PyCQA/pylint/issues/1984, already fixed in master. + if active: # pylint: disable=simplifiable-if-statement force_entry = True else: disabled = True

6 years, 2 months

Even more various fixes...

by Sven Panne

Module: check_mk Branch: master Commit: 4fb172f78a70daa37ccbbf6ca34d11a803fd4820 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4fb172f78a70da… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jul 13 12:01:03 2018 +0200 Even more various fixes... Change-Id: Ic7d49b08846ce89d1eae8bb6060e7262c1d54480 --- cmk/gui/wato/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index e264154..3b04fa0 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -4433,7 +4433,7 @@ class ModeBulkDiscovery(WatoMode): def _from_html_vars(self): self._start = bool(html.var("_start")) - self._all = bool(html.var("all")): + self._all = bool(html.var("all")) self._item = html.var("_item") if html.var("_item") else None

6 years, 2 months

Various fixes to previous fixes, more to come...

by Sven Panne

Module: check_mk Branch: master Commit: 1de0b5a86b679d1e1c85e2dd5eade6b689f9a95a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1de0b5a86b679d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jul 13 11:08:18 2018 +0200 Various fixes to previous fixes, more to come... Change-Id: I628cebc41d76c3661361f7803b40655eac9134c3 --- cmk/gui/plugins/views/inventory.py | 5 +---- cmk/gui/plugins/views/painters.py | 2 +- cmk/gui/plugins/wato/bi.py | 2 +- cmk/gui/plugins/wato/check_parameters.py | 21 +++++++-------------- cmk/gui/plugins/wato/utils.py | 5 +---- cmk/gui/wato/__init__.py | 17 +++-------------- 6 files changed, 14 insertions(+), 38 deletions(-) diff --git a/cmk/gui/plugins/views/inventory.py b/cmk/gui/plugins/views/inventory.py index a425baa..1f86793 100644 --- a/cmk/gui/plugins/views/inventory.py +++ b/cmk/gui/plugins/views/inventory.py @@ -1921,10 +1921,7 @@ def ajax_inv_render_tree(): hostname = html.var("host") invpath = html.var("path") tree_id = html.var("treeid", "") - if html.var("show_internal_tree_paths"): - show_internal_tree_paths = True - else: - show_internal_tree_paths = False + show_internal_tree_paths = bool(html.var("show_internal_tree_paths")) if tree_id: struct_tree = inventory.load_delta_tree(hostname, int(tree_id[1:])) tree_renderer = DeltaNodeRenderer(hostname, tree_id, invpath) diff --git a/cmk/gui/plugins/views/painters.py b/cmk/gui/plugins/views/painters.py index d64bc83..561ac40 100644 --- a/cmk/gui/plugins/views/painters.py +++ b/cmk/gui/plugins/views/painters.py @@ -593,7 +593,7 @@ multisite_painters["svc_check_cache_info"] = { "short" : _("Cached"), "columns" : [ "service_last_check", "service_cached_at", "service_cache_interval" ], "options" : [ "ts_format", "ts_date" ], - "paint" : lambda row: paint_cache_info(row), + "paint" : paint_cache_info, } multisite_painters["svc_next_check"] = { diff --git a/cmk/gui/plugins/wato/bi.py b/cmk/gui/plugins/wato/bi.py index ab02316..d5392c3 100644 --- a/cmk/gui/plugins/wato/bi.py +++ b/cmk/gui/plugins/wato/bi.py @@ -588,7 +588,7 @@ class ModeBI(WatoMode, BIManagement): title = _("Arguments:"), ), ], - validate = lambda v, vp: self._validate_rule_call(v, vp), + validate = self._validate_rule_call, ) diff --git a/cmk/gui/plugins/wato/check_parameters.py b/cmk/gui/plugins/wato/check_parameters.py index 9f998df..8411166 100644 --- a/cmk/gui/plugins/wato/check_parameters.py +++ b/cmk/gui/plugins/wato/check_parameters.py @@ -881,20 +881,13 @@ register_check_parameters( # '----------------------------------------------------------------------' def transform_ipmi_inventory_rules(p): - if type(p) == dict: - if p.get("summarize", True): - summarize = True - else: - summarize = False - - if summarize: - p = 'summarize' - else: - if p.get('ignored_sensors', []): - p = ('single', {'ignored_sensors' : p["ignored_sensors"]}) - else: - p = ('single', {}) - return p + if not isinstance(p, dict): + return p + if p.get("summarize", True): + return 'summarize' + if p.get('ignored_sensors', []): + return ('single', {'ignored_sensors' : p["ignored_sensors"]}) + return ('single', {}) register_rule( group + '/' + subgroup_inventory, diff --git a/cmk/gui/plugins/wato/utils.py b/cmk/gui/plugins/wato/utils.py index 9a05127..5f536e2 100644 --- a/cmk/gui/plugins/wato/utils.py +++ b/cmk/gui/plugins/wato/utils.py @@ -774,10 +774,7 @@ class TimeperiodValuespec(ValueSpec): # Checks whether the value itself already uses the tp-mode def _is_active(self, value): - if isinstance(value, dict) and self.tp_default_value_key in value: - return True - else: - return False + return isinstance(value, dict) and self.tp_default_value_key in value # Returns simply the value or converts a plain value to a tp-value diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index 3ff0bef..e264154 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -4432,20 +4432,9 @@ class ModeBulkDiscovery(WatoMode): def _from_html_vars(self): - if html.var("_start"): - self._start = True - else: - self._start = False - - if html.var("all"): - self._all = True - else: - self._all = False - - if html.var("_item"): - self._item = html.var("_item") - else: - self._item = None + self._start = bool(html.var("_start")) + self._all = bool(html.var("all")): + self._item = html.var("_item") if html.var("_item") else None def _get_bulk_discovery_params(self):

6 years, 2 months

Fixed and enabled unnecessary-lambda warnings.

by Sven Panne

Module: check_mk Branch: master Commit: 013db70cdaf2137574a49dba2bbf9edfe5636026 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=013db70cdaf213… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jul 13 10:52:03 2018 +0200 Fixed and enabled unnecessary-lambda warnings. Change-Id: I5a076cc2f884eaf7f867402a2a60e192a087d54a --- cmk/gui/multitar.py | 4 ++-- cmk/gui/pagetypes.py | 8 ++++---- tests/pylint/pylintrc | 3 +-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/cmk/gui/multitar.py b/cmk/gui/multitar.py index cd7ece2..ea96beb 100644 --- a/cmk/gui/multitar.py +++ b/cmk/gui/multitar.py @@ -560,10 +560,10 @@ def extract_domains(tar, domains): logger.info("Restoring snapshot: %s" % tar.name) logger.info("Domains: %s" % ", ".join(tar_domains.keys())) for what, abort_on_error, handler in [ - ("Permissions", True, lambda domain, tar_member: check_domain(domain, tar_member)), + ("Permissions", True, check_domain), ("Pre-Restore", True, lambda domain, tar_member: execute_restore(domain, is_pre_restore = True)), ("Cleanup", False, lambda domain, tar_member: cleanup_domain(domain)), - ("Extract", False, lambda domain, tar_member: extract_domain(domain, tar_member)), + ("Extract", False, extract_domain), ("Post-Restore", False, lambda domain, tar_member: execute_restore(domain, is_pre_restore = False)) ]: errors = [] diff --git a/cmk/gui/pagetypes.py b/cmk/gui/pagetypes.py index aba32ee..1c41daf 100644 --- a/cmk/gui/pagetypes.py +++ b/cmk/gui/pagetypes.py @@ -356,7 +356,7 @@ class PageRenderer(Base): def page_handlers(cls): handlers = super(PageRenderer, cls).page_handlers() handlers.update({ - cls.type_name(): lambda: cls.page_show(), + cls.type_name(): cls.page_show, }) return handlers @@ -448,8 +448,8 @@ class Overridable(Base): def page_handlers(cls): handlers = super(Overridable, cls).page_handlers() handlers.update({ - "%ss" % cls.type_name() : lambda: cls.page_list(), - "edit_%s" % cls.type_name() : lambda: cls.page_edit(), + "%ss" % cls.type_name() : cls.page_list, + "edit_%s" % cls.type_name() : cls.page_edit, }) return handlers @@ -1237,7 +1237,7 @@ class OverridableContainer(Overridable, Container): handlers = super(OverridableContainer, cls).page_handlers() handlers.update({ # Ajax handler for adding elements to a container - "ajax_pagetype_add_element": lambda: cls.ajax_add_element() + "ajax_pagetype_add_element": cls.ajax_add_element }) return handlers diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index 1b5807c..89afb96 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -77,9 +77,8 @@ disable= wrong-import-order, wrong-import-position, #--------------------------------------------------------------------------- - # The 3 warnings below have already been fixed for non-web/ code. When the + # The 2 warnings below have already been fixed for non-web/ code. When the # upcoming reorganization of web/ has been landed, these should be fixed first. - unnecessary-lambda, unnecessary-pass, useless-super-delegation, #---------------------------------------------------------------------------

6 years, 2 months

← Newer
1
...
24
25
26
27
28
29
30
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2018