Enh: prepare a python3 compat, bu changing all iteritems() to items. 5% perf penalty in python2 at least :'(

Author: naparuba

data/global-configuration/packs/core-cli-agent/cli/cli.py

@@ -148,7 +148,7 @@ def do_info(show_logs):
     modules_by_states = {}
     for module_state in MODULE_STATES:
         modules_by_states[module_state] = []
-    for (module_name, module) in modules.iteritems():
+    for (module_name, module) in modules.items():
         modules_by_states[module['state']].append(module)
 
     strs = []
@@ -393,7 +393,7 @@ def do_modules_state():
     modules = d.get('modules', {})
     print_info_title('Modules')
     modules_types = {}
-    for (module_name, module) in modules.iteritems():
+    for (module_name, module) in modules.items():
         module_type = module['module_type']
         if module_type not in modules_types:
             modules_types[module_type] = {}
@@ -402,7 +402,7 @@ def do_modules_state():
     modules_type_names = modules_types.keys()
     modules_type_names.sort()
 
-    for (module_type, _modules) in modules_types.iteritems():
+    for (module_type, _modules) in modules_types.items():
         cprint(' - [', end='')
         cprint(' %-10s ' % module_type.capitalize(), color='magenta', end='')
         cprint(' ]: ', end='')
@@ -519,7 +519,7 @@ def do_show_threads():
         e['threads'].append(t)
 
     # Sort threads inside the parts
-    for (pname, e) in threads_into_parts.iteritems():
+    for (pname, e) in threads_into_parts.items():
         e['threads'].sort(_sort_threads)
 
     # Now have parts sort by their times (from bigger to min)
@@ -615,7 +615,7 @@ def do_follow_log(part=''):
                     w = 0.001
                     for line in data.splitlines():
                         already_print = False
-                        for (k, color) in colors.iteritems():
+                        for (k, color) in colors.items():
                             if k in line:
                                 cprint(line, color=color)
                                 already_print = True

data/global-configuration/packs/core-cli-collectors/cli/cli.py

@@ -18,7 +18,7 @@
 
 def _extract_data_from_results(d, prefix, res):
     if isinstance(d, dict):
-        for (k, v) in d.iteritems():
+        for (k, v) in d.items():
             _extract_data_from_results(v, prefix + '.' + k, res)
             continue
     elif isinstance(d, list) or isinstance(d, set):
@@ -77,7 +77,7 @@ def do_collectors_show(name='', all=False):
         return
 
     disabled = []
-    for (cname, d) in collectors.iteritems():
+    for (cname, d) in collectors.items():
         if name and not name == cname:
             continue
         if not name and not d['active'] and not all:
@@ -106,7 +106,7 @@ def do_collectors_state():
 
 def do_collectors_run(name):
     collectormgr.load_collectors({})
-    for (colname, e) in collectormgr.collectors.iteritems():
+    for (colname, e) in collectormgr.collectors.items():
         colname = e['name']
         if colname != name:
             continue
@@ -129,7 +129,7 @@ def do_collectors_wait_ok(collector_name, timeout=30):
             logger.error(exp)
             return
         collector = None
-        for (cname, c) in collectors.iteritems():
+        for (cname, c) in collectors.items():
             if cname == collector_name:
                 collector = c
         if not collector:

data/global-configuration/packs/core-cli-compliance/cli/cli.py

@@ -80,7 +80,7 @@ def do_compliance_state(compliance_name=''):
         return
     print_h1('Compliances')
     packs = {}
-    for (cname, compliance) in compliances.iteritems():
+    for (cname, compliance) in compliances.items():
         if compliance_name and compliance['name'] != compliance_name:
             continue
         pack_name = compliance['pack_name']
@@ -127,7 +127,7 @@ def do_compliance_history():
             if compliance_name not in entries_by_compliances:
                 entries_by_compliances[compliance_name] = {'pack_name': pack_name, 'mode': mode, 'entries': []}
             entries_by_compliances[compliance_name]['entries'].append(entry)
-        for (compliance_name, d) in entries_by_compliances.iteritems():
+        for (compliance_name, d) in entries_by_compliances.items():
             pack_name = d['pack_name']
             mode = d['mode']
             entries = d['entries']
@@ -161,7 +161,7 @@ def do_compliance_wait_compliant(compliance_name, timeout=30, exit_if_ok=True):
             logger.error('Bad return from the server %s' % exp)
             return
         compliance = None
-        for (cname, c) in compliances.iteritems():
+        for (cname, c) in compliances.items():
             if c['name'] == compliance_name:
                 compliance = c
         if not compliance:

data/global-configuration/packs/core-cli-dashboards/cli/cli.py

@@ -165,7 +165,7 @@ def do_dashboards_list():
         sys.exit(0)
 
     packs = {}
-    for (dname, dashboard) in dashboards.iteritems():
+    for (dname, dashboard) in dashboards.items():
         pack_name = dashboard['pack_name']
         if pack_name not in packs:
             packs[pack_name] = {}

data/global-configuration/packs/core-cli-detectors/cli/cli.py

@@ -65,7 +65,7 @@ def do_detect_run():
     print_info_title('Detectors results')
     all_groups = []
     new_groups = []
-    for (k, v) in d.iteritems():
+    for (k, v) in d.items():
         all_groups.extend(v['groups'])
         new_groups.extend(v['new_groups'])
     e = [('Groups', ','.join(all_groups))]

data/global-configuration/packs/core-cli-executor/cli/cli.py

@@ -38,7 +38,7 @@ def do_exec(group='*', cmd='uname -a'):
     j = json.loads(r)
 
     res = j['res']
-    for (uuid, e) in res.iteritems():
+    for (uuid, e) in res.items():
         node = e['node']
         nname = node['name']
         color = {'alive': 'green', 'dead': 'red', 'suspect': 'yellow', 'leave': 'cyan'}.get(node['state'], 'cyan')

data/global-configuration/packs/core-cli-generators/cli/cli.py

@@ -56,7 +56,7 @@ def do_generators_state(show_diff=False):
         return
     print_h1('Generators')
     packs = {}
-    for (cname, generator) in generators.iteritems():
+    for (cname, generator) in generators.items():
         pack_name = generator['pack_name']
         if pack_name not in packs:
             packs[pack_name] = {}
@@ -122,7 +122,7 @@ def do_generators_wait_compliant(generator_name, timeout=30):
             logger.error('Bad return from the server %s' % exp)
             return
         generator = None
-        for (cname, c) in generators.iteritems():
+        for (cname, c) in generators.items():
             if c['name'] == generator_name:
                 generator = c
         if not generator:

data/global-configuration/packs/core-cli-gossip/cli/cli.py

@@ -211,7 +211,7 @@ def do_zone_list():
     except get_request_errors() as exp:
         logger.error(exp)
         return
-    for (zname, zone) in zones.iteritems():
+    for (zname, zone) in zones.items():
         cprint(' * ', end='')
         cprint(zname, color='magenta')
         sub_zones = zone.get('sub-zones', [])

data/global-configuration/packs/core-cli-monitoring/cli/cli.py

@@ -42,7 +42,7 @@ def do_state(name=''):
     if len(services) == 0:
         cprint('No services', color='grey')
     else:
-        for (sname, service) in services.iteritems():
+        for (sname, service) in services.items():
             state = service['state_id']
             cprint('\t%s ' % sname.ljust(20), end='')
             c = {0: 'green', 2: 'red', 1: 'yellow', 3: 'cyan'}.get(state, 'cyan')
@@ -58,7 +58,7 @@ def do_state(name=''):
 
     print_h1('Checks')
     packs = {}
-    for (cname, check) in checks.iteritems():
+    for (cname, check) in checks.items():
         pack_name = check['pack_name']
         if pack_name not in packs:
             packs[pack_name] = {}
@@ -159,7 +159,7 @@ def do_wait_ok(check_name, timeout=30):
             return
         checks = states['checks']
         check = None
-        for (cname, c) in checks.iteritems():
+        for (cname, c) in checks.items():
             if c['display_name'] == name:
                 check = c
         if not check:

data/global-configuration/packs/core-cli-packs/cli/cli.py

@@ -48,7 +48,7 @@ def __print_element_parameters(elt, pack_name, pack_level, main_topic_color, wha
         cprint(CHARACTERS.check, color='green')
     else:
         cprint('%s  %s %s' % (config_snapshot['state'], CHARACTERS.arrow_left, config_snapshot['errors']), color='red')
-    for parameter_name, parameter_snap in config_snapshot['parameters'].iteritems():
+    for parameter_name, parameter_snap in config_snapshot['parameters'].items():
         __print_line_header(main_topic_color)
         cprint('   %s- ' % (' ' * offset), end='')
         cprint('%s.packs.%s.%s.' % (pack_level, pack_name, what), color='grey', end='')
@@ -122,7 +122,7 @@ def do_packs_show():
 
     from opsbro.monitoring import monitoringmgr
     checks = monitoringmgr.checks
-    for cname, check in checks.iteritems():
+    for cname, check in checks.items():
         pack_name = check['pack_name']
         pack_level = check['pack_level']
         packs[pack_level][pack_name]['checks'][cname] = check
@@ -136,14 +136,14 @@ def do_packs_show():
 
     from opsbro.collectormanager import collectormgr
     collectors = collectormgr.collectors
-    for colname, collector in collectors.iteritems():
+    for colname, collector in collectors.items():
         pack_name = collector['inst'].pack_name
         pack_level = collector['inst'].pack_level
         packs[pack_level][pack_name]['collectors'][colname] = collector
 
     from opsbro.generatormgr import generatormgr
     generators = generatormgr.generators
-    for gname, generator in generators.iteritems():
+    for gname, generator in generators.items():
         pack_name = generator.pack_name
         pack_level = generator.pack_level
         packs[pack_level][pack_name]['generators'][gname] = generator
@@ -190,7 +190,7 @@ def do_packs_show():
                 __print_line_header(main_topic_color)
                 print_element_breadcumb(pack_name, pack_level, 'checks')
                 cprint(' (%d)' % len(checks), color='magenta')
-                for cname, check in checks.iteritems():
+                for cname, check in checks.items():
                     __print_line_header(main_topic_color)
                     cprint('  - ', end='')
                     cprint('checks > %-15s' % cname.split(os.sep)[-1], color='cyan', end='')
@@ -216,7 +216,7 @@ def do_packs_show():
                 __print_line_header(main_topic_color)
                 print_element_breadcumb(pack_name, pack_level, 'collectors')
                 cprint(' (%d)' % len(collectors), color='magenta')
-                for colname, collector_d in collectors.iteritems():
+                for colname, collector_d in collectors.items():
                     __print_line_header(main_topic_color)
                     collector = collector_d['inst']
                     cprint('  - ', end='')
@@ -233,7 +233,7 @@ def do_packs_show():
                 __print_line_header(main_topic_color)
                 print_element_breadcumb(pack_name, pack_level, 'generators')
                 cprint(' (%d)' % len(generators), color='magenta')
-                for gname, generator in generators.iteritems():
+                for gname, generator in generators.items():
                     __print_line_header(main_topic_color)
                     cprint('  - ', end='')
                     cprint('generators > %-15s' % gname.split(os.sep)[-1], color='cyan', end='')
@@ -250,8 +250,8 @@ def do_packs_list():
     from opsbro.packer import packer
     packs = packer.get_packs()
     all_pack_names = set()
-    for (level, packs_in_level) in packs.iteritems():
-        for (pname, _) in packs_in_level.iteritems():
+    for (level, packs_in_level) in packs.items():
+        for (pname, _) in packs_in_level.items():
             all_pack_names.add(pname)
 
     print_h2('Legend (topics)')

data/global-configuration/packs/docker/cli/cli.py

@@ -25,7 +25,7 @@ def do_docker_show():
     print_info_title('Docker Stats')
     if not scontainers:
         cprint("No running containers", color='grey')
-    for (cid, stats) in scontainers.iteritems():
+    for (cid, stats) in scontainers.items():
         print_info_title('Container:%s' % cid)
         keys = stats.keys()
         keys.sort()
@@ -37,7 +37,7 @@ def do_docker_show():
         # Normal agent information
         print_2tab(e, capitalize=False, col_size=30)
 
-    for (cid, stats) in simages.iteritems():
+    for (cid, stats) in simages.items():
         print_info_title('Image:%s (sum)' % cid)
         keys = stats.keys()
         keys.sort()

data/global-configuration/packs/graphite/module/module.py

@@ -189,7 +189,7 @@ def grok_graphite_data(self, data):
                 l.append(line)
                 forwards[ts_node_manager] = l
 
-        for (uuid, lst) in forwards.iteritems():
+        for (uuid, lst) in forwards.items():
             node = gossiper.get(uuid)
             # maybe the node disapear? bail out, we are not lucky
             if node is None:

data/global-configuration/packs/redis/collectors/collector_redis.py

@@ -91,7 +91,7 @@ def launch(self):
         info['available'] = True
 
         to_add = {}
-        for (k, v) in info.iteritems():
+        for (k, v) in info.items():
             if k in self.RATE_KEYS:
                 if k in self.store:
                     nv = (v - self.store[k]) / diff

data/global-configuration/packs/shinken-enterprise/module/module.py

@@ -25,14 +25,14 @@ def stopping_agent(self):
         self.logger.info('Pushing back ours groups and discovery informations to Shinken Enterprise')
 
         collectors_data = {}
-        for (ccls, e) in collectormgr.collectors.iteritems():
+        for (ccls, e) in collectormgr.collectors.items():
             cname, c = collectormgr.get_collector_json_extract(e)
             collectors_data[cname] = c
 
         # In groups=> templates, we do not want : and . in the names
         _mapping = {':': '--', '.': '--'}
         use_value = ','.join(groups)
-        for (k, v) in _mapping.iteritems():
+        for (k, v) in _mapping.items():
             use_value = use_value.replace(k, v)
 
         payload = {

data/global-configuration/packs/statsd/module/module.py

@@ -152,7 +152,7 @@ def compute_stats(self):
             self.timers = {}
 
         _t = time.time()
-        for (mname, timer) in timers.iteritems():
+        for (mname, timer) in timers.items():
             # We will need to compute the mean_99, count_99, upper_99, sum_99, sum_quares_99
             # but also std, upper, lower, count, count_ps, sum, sum_square, mean, median
             _t = time.time()

data/global-configuration/packs/system/collectors/collector_cpustats.py

@@ -42,20 +42,20 @@ def _get_linux_abs_stats(self):
                 r[h_name][columns[i]] = values[i]
         # if we have multiple cpus, prepare the all in a percent way
         if nb_cpus >= 2:
-            for (column, v) in r['cpu_all'].iteritems():
+            for (column, v) in r['cpu_all'].items():
                 r['cpu_all'][column] = int(v / float(nb_cpus))
         return r
 
 
     def compute_linux_cpu_stats(self, new_cpu_raw_stats, diff_time):
         r = {}
-        for (k, new_stats) in new_cpu_raw_stats.iteritems():
+        for (k, new_stats) in new_cpu_raw_stats.items():
             old_stats = self.prev_linux_stats.get(k, None)
             # A new cpu did spawn? wait a loop to compute it
             if old_stats is None:
                 continue
             r[k] = {}
-            for (t, new_v) in new_stats.iteritems():
+            for (t, new_v) in new_stats.items():
                 old_v = old_stats[t]
                 this_type_consumed = (new_v - old_v) / float(diff_time)
                 r[k][t] = this_type_consumed

data/global-configuration/packs/system/collectors/collector_iostats.py

@@ -72,13 +72,13 @@ def _get_disk_stats(self):
 
     def compute_linux_disk_stats(self, new_raw_stats, diff_time):
         r = {}
-        for (device, new_stats) in new_raw_stats.iteritems():
+        for (device, new_stats) in new_raw_stats.items():
             old_stats = self.previous_raw.get(device, None)
             # A new disk did spawn? wait a loop to compute it
             if old_stats is None:
                 continue
             r[device] = {}
-            for (k, new_v) in new_stats.iteritems():
+            for (k, new_v) in new_stats.items():
                 old_v = old_stats[k]
 
                 # String= device name, but we already have it in the key path

data/global-configuration/packs/system/collectors/collector_kernelstats.py

@@ -68,7 +68,7 @@ def launch(self):
             # Now loop through each interface
             by_sec_keys = ['ctxt', 'processes', 'pgfault', 'pgmajfault']
             to_add = {}
-            for (k, v) in data.iteritems():
+            for (k, v) in data.items():
                 if k in by_sec_keys:
                     if k in self.store:
                         to_add['%s/s' % k] = (v - self.store[k]) / diff

opsbro/cli.py

@@ -446,7 +446,7 @@ def load_cli_mods(self, opts):
                 exports = getattr(m, 'exports', {})
                 # get the topics from the pack definition
                 topics = packer.get_pack_all_topics(pname)
-                for (f, raw_entry) in exports.iteritems():
+                for (f, raw_entry) in exports.items():
                     self._create_cli_entry(f, raw_entry, topics)
 
         logger.debug('We load the keywords %s' % self.keywords)
@@ -541,7 +541,7 @@ def one_loop(self, command_args):
 
     def print_completion(self, args):
         to_analayses = []
-        for (k, d) in self.keywords.iteritems():
+        for (k, d) in self.keywords.items():
             if k != 'global':
                 to_analayses.append([k])
                 for sub_k in d.keys():