[checkmk-commits] Cleanup ancient discovery function handling

Module: check_mk Branch: master Commit: 35524d07966cf82bbc94b6376a0a38afb596778f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35524d07966cf8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Apr 14 19:38:47 2019 +0200 Cleanup ancient discovery function handling Change-Id: I89827e18312a708bbf184bbf65aa7315913ab7d5 --- cmk_base/discovery.py | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/cmk_base/discovery.py b/cmk_base/discovery.py index d3e5298..6b36a98 100644 --- a/cmk_base/discovery.py +++ b/cmk_base/discovery.py @@ -27,7 +27,6 @@ import os import socket import time -import inspect import signal from cmk.utils.regex import regex @@ -842,15 +841,7 @@ def _execute_discovery(multi_host_sections, hostname, ipaddress, check_plugin_na and not config.check_info[check_plugin_name]["handle_empty_info"]: return [] - # Check number of arguments of discovery function. Note: This - # check for the legacy API will be removed after 1.2.6. - if len(inspect.getargspec(discovery_function).args) == 2: - discovered_items = discovery_function( - check_plugin_name, - section_content) # discovery is a list of pairs (item, current_value) - else: - # New preferred style since 1.1.11i3: only one argument: section_content - discovered_items = discovery_function(section_content) + discovered_items = discovery_function(section_content) # tolerate function not explicitely returning [] if discovered_items is None: