[checkmk-commits] Refactor all map bin input hex next buffer list

Module: check_mk Branch: master Commit: 83c92349010e79f9e7a15698b2894ce13a54606b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83c92349010e79… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Thu Sep 27 12:50:33 2018 +0200 Refactor all map bin input hex next buffer list Change-Id: Iad618c408dfd8bad1488cf85e13832cdea2e0715 --- checks/drbd | 4 ++-- checks/hp_proliant_da_cntlr | 6 +++--- checks/hp_sts_drvbox | 6 +++--- checks/mcdata_fcport | 4 ++-- checks/openhardwaremonitor | 4 ++-- checks/saprouter_cert | 4 ++-- cmk/ec/main.py | 6 +++--- cmk/gui/multitar.py | 4 ++-- cmk_base/packaging.py | 6 ++---- inventory/cisco_vlans | 4 ++-- 10 files changed, 23 insertions(+), 25 deletions(-) diff --git a/checks/drbd b/checks/drbd index 92fcf74..a9b6564 100644 --- a/checks/drbd +++ b/checks/drbd @@ -343,11 +343,11 @@ check_info["drbd"] = { 'service_description' : 'DRBD %s status', } -def drbd_get_rates(list): +def drbd_get_rates(list_): now = time.time() output = '' perfdata = [] - for type_, name, item, value, uom in list: + for type_, name, item, value, uom in list_: rate = get_rate("%s.%s.%s" % (type_, name, item), now, value) perfdata.append((name, rate)) output += ' %s/sec: %s%s' % (name, rate, uom) diff --git a/checks/hp_proliant_da_cntlr b/checks/hp_proliant_da_cntlr index 5edd7f8..187230d 100644 --- a/checks/hp_proliant_da_cntlr +++ b/checks/hp_proliant_da_cntlr @@ -59,17 +59,17 @@ def check_hp_proliant_da_cntlr(item, params, info): sum_state = 0 output = [] - for val, label, map in [ (cond, 'Condition', hp_proliant_da_cntlr_cond_map), + for val, label, map_ in [(cond, 'Condition', hp_proliant_da_cntlr_cond_map), (b_cond, 'Board-Condition', hp_proliant_da_cntlr_cond_map), (b_status, 'Board-Status', hp_proliant_da_cntlr_state_map) ]: - this_state = map[val][0] + this_state = map_[val][0] state_txt = '' if this_state == 1: state_txt = ' (!)' elif this_state == 2: state_txt = ' (!!)' sum_state = max(sum_state, this_state) - output.append('%s: %s%s' % (label, map[val][1], state_txt)) + output.append('%s: %s%s' % (label, map_[val][1], state_txt)) output.append('(Role: %s, Model: %s, Slot: %s, Serial: %s)' % (hp_proliant_da_cntlr_role_map.get(role, 'unknown'), model, slot, serial)) diff --git a/checks/hp_sts_drvbox b/checks/hp_sts_drvbox index d170a95..ecfb846 100644 --- a/checks/hp_sts_drvbox +++ b/checks/hp_sts_drvbox @@ -90,12 +90,12 @@ def check_hp_sts_drvbox(item, _no_params, info): sum_state = 0 output = [] - for val, label, map in [ (fan_status, 'Fan-Status', hp_sts_drvbox_fan_map), + for val, label, map_ in [(fan_status, 'Fan-Status', hp_sts_drvbox_fan_map), (cond, 'Condition', hp_sts_drvbox_cond_map), (temp_status, 'Temp-Status', hp_sts_drvbox_temp_map), (sp_status, 'Sidepanel-Status', hp_sts_drvbox_sp_map), (pwr_status, 'Power-Status', hp_sts_drvbox_power_map), ]: - this_state = map[val][0] + this_state = map_[val][0] if this_state is None: continue # skip unsupported checks state_txt = '' @@ -104,7 +104,7 @@ def check_hp_sts_drvbox(item, _no_params, info): elif this_state == 2: state_txt = ' (!!)' sum_state = max(sum_state, this_state) - output.append('%s: %s%s' % (label, map[val][1], state_txt)) + output.append('%s: %s%s' % (label, map_[val][1], state_txt)) output.append('(Type: %s, Model: %s, Serial: %s, Location: %s)' % (hp_sts_drvbox_type_map.get(ty, 'unknown'), model, serial, loc)) diff --git a/checks/mcdata_fcport b/checks/mcdata_fcport index 5c0c1fe..7adbc69 100644 --- a/checks/mcdata_fcport +++ b/checks/mcdata_fcport @@ -27,8 +27,8 @@ mcdata_fcport_speedbits = { "2": '1000000000', "3": '2000000000' } mcdata_fcport_opstatus = { "1" : "1", "2": "2", "3": "testing", "4": "faulty" } -def mcdata_bin_to_64(bin): - return str(binstring_to_int(bin)) +def mcdata_bin_to_64(bin_): + return str(binstring_to_int(bin_)) def mcdata_fcport_convert_to_if64(info): return map(mcdata_fcport_convert_line_to_if64, info) diff --git a/checks/openhardwaremonitor b/checks/openhardwaremonitor index c373fa8..69fff8a 100644 --- a/checks/openhardwaremonitor +++ b/checks/openhardwaremonitor @@ -63,9 +63,9 @@ factory_settings['openhardwaremonitor_temperature_default_levels'] = { def parse_openhardwaremonitor(info): - def dict_replace(input, replacements): + def dict_replace(input_, replacements): pattern = regex(r'\b(' + '|'.join(replacements.keys()) + r')\b') - return pattern.sub(lambda x: replacements[x.group()], input) + return pattern.sub(lambda x: replacements[x.group()], input_) result = {} diff --git a/checks/saprouter_cert b/checks/saprouter_cert index e6d36a0..9780988 100644 --- a/checks/saprouter_cert +++ b/checks/saprouter_cert @@ -52,8 +52,8 @@ factory_settings["saprouter_cert_default_levels"] = { def parse_saprouter_cert(info): - def parse_date(list): - time_struct = time.strptime(" ".join(list), "%b %d %H:%M:%S %Y") + def parse_date(list_): + time_struct = time.strptime(" ".join(list_), "%b %d %H:%M:%S %Y") return time.mktime(time_struct), "%s-%s-%s" % time_struct[:3] parsed = {} diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 801eb25..2e13bb1 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -3311,9 +3311,9 @@ class EventStatus(object): # Make sure that if the user switches from day to hour and we # are still waiting for the first interval to begin, that we # do not wait for the next day. - next = self.next_interval_start(interval, time.time()) - if start > next: - start = next + next_interval = self.next_interval_start(interval, time.time()) + if start > next_interval: + start = next_interval self._interval_starts[rule_id] = start return start diff --git a/cmk/gui/multitar.py b/cmk/gui/multitar.py index 4497b3c..b558605 100644 --- a/cmk/gui/multitar.py +++ b/cmk/gui/multitar.py @@ -413,9 +413,9 @@ def filter_subtar_files(tarinfo, excludes): return tarinfo -def extract_from_buffer(buffer, elements): +def extract_from_buffer(buffer_, elements): stream = cStringIO.StringIO() - stream.write(buffer) + stream.write(buffer_) stream.seek(0) if type(elements) == list: extract(tarfile.open(None, "r", stream), elements) diff --git a/cmk_base/packaging.py b/cmk_base/packaging.py index 7a909eb..357322c 100644 --- a/cmk_base/packaging.py +++ b/cmk_base/packaging.py @@ -726,13 +726,11 @@ def write_package_info(package): def remove_package_info(pacname): - os.remove(pac_dir + pacname) + os.remove(pac_dir + pacname) def all_package_names(): - all = [ p for p in os.listdir(pac_dir) if p not in [ '.', '..' ] ] - all.sort() - return all + return sorted([p for p in os.listdir(pac_dir) if p not in ['.', '..']]) def parse_package_info(python_string): diff --git a/inventory/cisco_vlans b/inventory/cisco_vlans index 9584403..f73b322 100644 --- a/inventory/cisco_vlans +++ b/inventory/cisco_vlans @@ -64,8 +64,8 @@ def parse_multi_vlan(vlan_multi): return "-".join(map(str, subinfo)) vlans = [] - for k, hex in enumerate(vlan_multi): - for l, bit in enumerate(bin(ord(hex))[2:]): + for k, hex_ in enumerate(vlan_multi): + for l, bit in enumerate(bin(ord(hex_))[2:]): if bit == '1': vlans.append(k*8 + l+1)