[checkmk-commits] Code cleanup: fnmatch now generally imported, remove import from checks

Module: check_mk Branch: master Commit: 205d3799e6771625d3ec2ac8dcc438b0e69fbd8d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=205d3799e67716… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Oct 24 15:39:28 2015 +0200 Code cleanup: fnmatch now generally imported, remove import from checks --- checks/df.include | 3 --- checks/fileinfo | 2 -- checks/logwatch | 1 - modules/check_mk_base.py | 1 + 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/checks/df.include b/checks/df.include index 3785a96..fc67469 100644 --- a/checks/df.include +++ b/checks/df.include @@ -66,7 +66,6 @@ factory_settings["filesystem_default_levels"] = { } def df_inventory(mplist): - import fnmatch group_patterns = {} for line in host_extra_conf(g_hostname, filesystem_groups): for group_name, pattern in line: @@ -248,8 +247,6 @@ def df_check_filesystem(hostname, mountpoint, size_mb, avail_mb, reserved_mb, pa # New function for checks that support groups. def df_check_filesystem_list(item, params, fslist_blocks, fslist_inodes = None): if "patterns" in params: - import fnmatch - patterns = params["patterns"] count = 0 total_size_mb = 0 diff --git a/checks/fileinfo b/checks/fileinfo index f030189..43c6a29 100644 --- a/checks/fileinfo +++ b/checks/fileinfo @@ -70,7 +70,6 @@ def fileinfo_process_date(pattern,reftime): return pattern def fileinfo_groups_of_file(check_filename,reftime): - import fnmatch groups = [] for line in host_extra_conf(g_hostname, fileinfo_groups): for group_name, pattern in line: @@ -148,7 +147,6 @@ def check_fileinfo_groups(item, params, info): outof_range_txt = fileinfo_check_timeranges(params) # TODO: import in check functions is not allowed - import fnmatch reftime = int(info[0][0]) count_all = 0 diff --git a/checks/logwatch b/checks/logwatch index 34e7707..a768b51 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -280,7 +280,6 @@ def logwatch_group_precompile(hostname, item, _unused): return logwatch_precompile(hostname, item, None), host_extra_conf(hostname, logwatch_groups) def logwatch_groups_of_logfile(filename, params=False): - import fnmatch groups = [] if not params: params = host_extra_conf(g_hostname, logwatch_groups) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 5a8099f..9cc0afe 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -44,6 +44,7 @@ sys.path.pop(0) import socket import os +import fnmatch import time import re import signal