From 823677b490d3ddc3bcfe8fa2f215d9d9c2167b14 Mon Sep 17 00:00:00 2001 From: Marius Gedminas Date: Thu, 3 Sep 2015 09:23:27 +0300 Subject: [PATCH] Replace .iteritems() with six.iteritems() Replace .iteritems() with six.iteritems() everywhere except in module_utils (because there's no 'six' on the remote host). And except in lib/ansible/galaxy/data/metadata_template.j2, because I'm not sure six is available there. --- contrib/inventory/apache-libcloud.py | 3 ++- contrib/inventory/cobbler.py | 6 ++++-- contrib/inventory/collins.py | 4 +++- contrib/inventory/consul_io.py | 3 ++- contrib/inventory/nova.py | 3 ++- contrib/inventory/proxmox.py | 5 ++++- contrib/inventory/rax.py | 4 +++- contrib/inventory/spacewalk.py | 8 +++++--- examples/scripts/yaml_to_ini.py | 3 ++- hacking/module_formatter.py | 3 ++- lib/ansible/cli/doc.py | 4 +++- lib/ansible/executor/play_iterator.py | 4 +++- lib/ansible/executor/process/result.py | 4 +++- lib/ansible/executor/task_executor.py | 4 +++- lib/ansible/inventory/script.py | 5 +++-- lib/ansible/playbook/play_context.py | 4 +++- lib/ansible/playbook/playbook_include.py | 4 +++- lib/ansible/playbook/role/__init__.py | 4 ++-- lib/ansible/playbook/role/definition.py | 2 +- lib/ansible/playbook/task.py | 6 +++--- lib/ansible/plugins/action/set_fact.py | 3 ++- lib/ansible/plugins/cache/__init__.py | 2 +- lib/ansible/plugins/connections/paramiko_ssh.py | 14 ++++++++------ lib/ansible/plugins/filter/core.py | 3 ++- lib/ansible/plugins/strategies/__init__.py | 6 ++++-- lib/ansible/plugins/strategies/linear.py | 4 +++- lib/ansible/template/vars.py | 3 ++- test/units/vars/test_variable_manager.py | 4 +++- 28 files changed, 81 insertions(+), 41 deletions(-) diff --git a/contrib/inventory/apache-libcloud.py b/contrib/inventory/apache-libcloud.py index f417e3a5e91..21436a02add 100755 --- a/contrib/inventory/apache-libcloud.py +++ b/contrib/inventory/apache-libcloud.py @@ -37,6 +37,7 @@ import re from time import time import ConfigParser +from six import iteritems from libcloud.compute.types import Provider from libcloud.compute.providers import get_driver import libcloud.security as sec @@ -268,7 +269,7 @@ class LibcloudInventory(object): elif key == 'ec2_region': instance_vars[key] = value.name elif key == 'ec2_tags': - for k, v in value.iteritems(): + for k, v in iteritems(value): key = self.to_safe('ec2_tag_' + k) instance_vars[key] = v elif key == 'ec2_groups': diff --git a/contrib/inventory/cobbler.py b/contrib/inventory/cobbler.py index aca045eaf78..b5fcdeacbbe 100755 --- a/contrib/inventory/cobbler.py +++ b/contrib/inventory/cobbler.py @@ -72,6 +72,8 @@ try: except ImportError: import simplejson as json +from six import iteritems + # NOTE -- this file assumes Ansible is being accessed FROM the cobbler # server, so it does not attempt to login with a username and password. # this will be addressed in a future version of this script. @@ -171,7 +173,7 @@ class CobblerInventory(object): interfaces = host['interfaces'] # hostname is often empty for non-static IP hosts if dns_name == '': - for (iname, ivalue) in interfaces.iteritems(): + for (iname, ivalue) in iteritems(interfaces): if ivalue['management'] or not ivalue['static']: this_dns_name = ivalue.get('dns_name', None) if this_dns_name is not None and this_dns_name is not "": @@ -203,7 +205,7 @@ class CobblerInventory(object): self.cache[dns_name] = host if "ks_meta" in host: - for key, value in host["ks_meta"].iteritems(): + for key, value in iteritems(host["ks_meta"]): self.cache[dns_name][key] = value self.write_to_cache(self.cache, self.cache_path_cache) diff --git a/contrib/inventory/collins.py b/contrib/inventory/collins.py index 72c5b88ea96..a33d27ec6d6 100755 --- a/contrib/inventory/collins.py +++ b/contrib/inventory/collins.py @@ -83,6 +83,8 @@ try: except ImportError: import simplejson as json +from six import iteritems + class CollinsDefaults(object): ASSETS_API_ENDPOINT = '%s/api/assets' @@ -174,7 +176,7 @@ class CollinsInventory(object): # the CQL search feature as described here: # http://tumblr.github.io/collins/recipes.html attributes_query = [ '='.join(attr_pair) - for attr_pair in attributes.iteritems() ] + for attr_pair in iteritems(attributes) ] query_parameters = { 'details': ['True'], 'operation': [operation], diff --git a/contrib/inventory/consul_io.py b/contrib/inventory/consul_io.py index 65d48721dcb..1bcf22d3730 100755 --- a/contrib/inventory/consul_io.py +++ b/contrib/inventory/consul_io.py @@ -141,6 +141,7 @@ except ImportError as e: http://python-consul.readthedocs.org/en/latest/#installation'""") sys.exit(1) +from six import iteritems class ConsulInventory(object): @@ -187,7 +188,7 @@ class ConsulInventory(object): an 'available' or 'unavailable' grouping. The suffix for each group can be controlled from the config''' if self.config.has_config('availability'): - for service_name, service in node['Services'].iteritems(): + for service_name, service in iteritems(node['Services']): for node in self.consul_api.health.service(service_name)[1]: for check in node['Checks']: if check['ServiceName'] == service_name: diff --git a/contrib/inventory/nova.py b/contrib/inventory/nova.py index 9561f4406ab..e8f3b9a6260 100755 --- a/contrib/inventory/nova.py +++ b/contrib/inventory/nova.py @@ -26,6 +26,7 @@ import re import os import ConfigParser from novaclient import client as nova_client +from six import iteritems try: import json @@ -194,7 +195,7 @@ if (len(sys.argv) == 2 and sys.argv[1] == '--list') or len(sys.argv) == 1: push(groups, server.name, access_ip) # Run through each metadata item and add instance to it - for key, value in server.metadata.iteritems(): + for key, value in iteritems(server.metadata): composed_key = to_safe('tag_{0}_{1}'.format(key, value)) push(groups, composed_key, access_ip) diff --git a/contrib/inventory/proxmox.py b/contrib/inventory/proxmox.py index 381b3ae7fb7..bc636d0ac36 100755 --- a/contrib/inventory/proxmox.py +++ b/contrib/inventory/proxmox.py @@ -25,6 +25,9 @@ import os import sys from optparse import OptionParser +from six import iteritems + + class ProxmoxNodeList(list): def get_names(self): return [node['node'] for node in self] @@ -32,7 +35,7 @@ class ProxmoxNodeList(list): class ProxmoxQemu(dict): def get_variables(self): variables = {} - for key, value in self.iteritems(): + for key, value in iteritems(self): variables['proxmox_' + key] = value return variables diff --git a/contrib/inventory/rax.py b/contrib/inventory/rax.py index 5892f2cbb94..0028f54d201 100755 --- a/contrib/inventory/rax.py +++ b/contrib/inventory/rax.py @@ -153,6 +153,8 @@ import warnings import collections import ConfigParser +from six import iteritems + from ansible.constants import get_config, mk_boolean try: @@ -267,7 +269,7 @@ def _list_into_cache(regions): hostvars[server.name]['rax_region'] = region - for key, value in server.metadata.iteritems(): + for key, value in iteritems(server.metadata): groups['%s_%s_%s' % (prefix, key, value)].append(server.name) groups['instance-%s' % server.id].append(server.name) diff --git a/contrib/inventory/spacewalk.py b/contrib/inventory/spacewalk.py index ecf19484328..fb0a152ecab 100755 --- a/contrib/inventory/spacewalk.py +++ b/contrib/inventory/spacewalk.py @@ -49,6 +49,8 @@ from optparse import OptionParser import subprocess import ConfigParser +from six import iteritems + try: import json except: @@ -193,10 +195,10 @@ if options.list: sys.exit(2) if options.human: - for group, systems in groups.iteritems(): + for group, systems in iteritems(groups): print('[%s]\n%s\n' % (group, '\n'.join(systems))) else: - final = dict( [ (k, list(s)) for k, s in groups.iteritems() ] ) + final = dict( [ (k, list(s)) for k, s in iteritems(groups) ] ) final["_meta"] = meta print(json.dumps( final )) #print(json.dumps(groups)) @@ -221,7 +223,7 @@ elif options.host: if options.human: print('Host: %s' % options.host) - for k, v in host_details.iteritems(): + for k, v in iteritems(host_details): print(' %s: %s' % (k, '\n '.join(v.split(';')))) else: print( json.dumps( dict( ( key, ( value.split(';') if ';' in value else value) ) for key, value in host_details.items() ) ) ) diff --git a/examples/scripts/yaml_to_ini.py b/examples/scripts/yaml_to_ini.py index 09b9b5ec820..981176b2f2d 100755 --- a/examples/scripts/yaml_to_ini.py +++ b/examples/scripts/yaml_to_ini.py @@ -23,6 +23,7 @@ from ansible import utils import os import yaml import sys +from six import iteritems class InventoryParserYaml(object): ''' Host inventory parser for ansible ''' @@ -176,7 +177,7 @@ if __name__ == "__main__": groupfh.write(yaml.dump(record.get_variables())) groupfh.close() - for (host_name, host_record) in yamlp._hosts.iteritems(): + for (host_name, host_record) in iteritems(yamlp._hosts): hostfiledir = os.path.join(dirname, "host_vars") if not os.path.exists(hostfiledir): print "* creating: %s" % hostfiledir diff --git a/hacking/module_formatter.py b/hacking/module_formatter.py index 755fc9e0d6b..00c9f577902 100755 --- a/hacking/module_formatter.py +++ b/hacking/module_formatter.py @@ -34,6 +34,7 @@ import subprocess import cgi import warnings from jinja2 import Environment, FileSystemLoader +from six import iteritems from ansible.utils import module_docs from ansible.utils.vars import merge_hash @@ -292,7 +293,7 @@ def process_module(module, options, env, template, outputname, module_map, alias del doc['version_added'] if 'options' in doc and doc['options']: - for (k,v) in doc['options'].iteritems(): + for (k,v) in iteritems(doc['options']): # don't show version added information if it's too old to be called out if 'version_added' in doc['options'][k] and too_old(doc['options'][k]['version_added']): del doc['options'][k]['version_added'] diff --git a/lib/ansible/cli/doc.py b/lib/ansible/cli/doc.py index e27d85d7990..e82b3ab642b 100644 --- a/lib/ansible/cli/doc.py +++ b/lib/ansible/cli/doc.py @@ -24,6 +24,8 @@ import termios import traceback import textwrap +from six import iteritems + from ansible import constants as C from ansible.errors import AnsibleError, AnsibleOptionsError from ansible.plugins import module_loader @@ -101,7 +103,7 @@ class DocCLI(CLI): if doc is not None: all_keys = [] - for (k,v) in doc['options'].iteritems(): + for (k,v) in iteritems(doc['options']): all_keys.append(k) all_keys = sorted(all_keys) doc['option_keys'] = all_keys diff --git a/lib/ansible/executor/play_iterator.py b/lib/ansible/executor/play_iterator.py index 340f8efd548..d64318fa1b1 100644 --- a/lib/ansible/executor/play_iterator.py +++ b/lib/ansible/executor/play_iterator.py @@ -21,6 +21,8 @@ __metaclass__ = type import fnmatch +from six import iteritems + from ansible import constants as C from ansible.errors import * @@ -322,7 +324,7 @@ class PlayIterator: self._host_states[host.name] = s def get_failed_hosts(self): - return dict((host, True) for (host, state) in self._host_states.iteritems() if state.run_state == self.ITERATING_COMPLETE and state.fail_state != self.FAILED_NONE) + return dict((host, True) for (host, state) in iteritems(self._host_states) if state.run_state == self.ITERATING_COMPLETE and state.fail_state != self.FAILED_NONE) def get_original_task(self, host, task): ''' diff --git a/lib/ansible/executor/process/result.py b/lib/ansible/executor/process/result.py index 3ed2a28e805..446fd3dba96 100644 --- a/lib/ansible/executor/process/result.py +++ b/lib/ansible/executor/process/result.py @@ -20,6 +20,8 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type from six.moves import queue +from six import iteritems + import multiprocessing import os import signal @@ -157,7 +159,7 @@ class ResultProcess(multiprocessing.Process): # if this task is registering facts, do that now item = result_item.get('item', None) if result._task.action in ('set_fact', 'include_vars'): - for (key, value) in result_item['ansible_facts'].iteritems(): + for (key, value) in iteritems(result_item['ansible_facts']): self._send_result(('set_host_var', result._host, result._task, item, key, value)) else: self._send_result(('set_host_facts', result._host, result._task, item, result_item['ansible_facts'])) diff --git a/lib/ansible/executor/task_executor.py b/lib/ansible/executor/task_executor.py index fdc57b82a91..ca5712757a8 100644 --- a/lib/ansible/executor/task_executor.py +++ b/lib/ansible/executor/task_executor.py @@ -25,6 +25,8 @@ import subprocess import sys import time +from six import iteritems + from ansible import constants as C from ansible.errors import AnsibleError, AnsibleParserError, AnsibleUndefinedVariable from ansible.playbook.conditional import Conditional @@ -289,7 +291,7 @@ class TaskExecutor: # And filter out any fields which were set to default(omit), and got the omit token value omit_token = variables.get('omit') if omit_token is not None: - self._task.args = dict(filter(lambda x: x[1] != omit_token, self._task.args.iteritems())) + self._task.args = dict(filter(lambda x: x[1] != omit_token, iteritems(self._task.args))) # Read some values from the task, so that we can modify them if need be retries = self._task.retries diff --git a/lib/ansible/inventory/script.py b/lib/ansible/inventory/script.py index 6e64b0e8948..b8082e2d8f5 100644 --- a/lib/ansible/inventory/script.py +++ b/lib/ansible/inventory/script.py @@ -22,9 +22,10 @@ __metaclass__ = type import os import subprocess import sys - from collections import Mapping +from six import iteritems + from ansible import constants as C from ansible.errors import * from ansible.inventory.host import Host @@ -122,7 +123,7 @@ class InventoryScript: raise AnsibleError("You defined a group \"%s\" with bad " "data for variables:\n %s" % (group_name, data)) - for k, v in data['vars'].iteritems(): + for k, v in iteritems(data['vars']): if group.name == all.name: all.set_variable(k, v) else: diff --git a/lib/ansible/playbook/play_context.py b/lib/ansible/playbook/play_context.py index e2d5feec760..d90220e2271 100644 --- a/lib/ansible/playbook/play_context.py +++ b/lib/ansible/playbook/play_context.py @@ -25,6 +25,8 @@ import pipes import random import re +from six import iteritems + from ansible import constants as C from ansible.errors import AnsibleError from ansible.playbook.attribute import Attribute, FieldAttribute @@ -308,7 +310,7 @@ class PlayContext(Base): # finally, use the MAGIC_VARIABLE_MAPPING dictionary to update this # connection info object with 'magic' variables from the variable list - for (attr, variable_names) in MAGIC_VARIABLE_MAPPING.iteritems(): + for (attr, variable_names) in iteritems(MAGIC_VARIABLE_MAPPING): for variable_name in variable_names: if variable_name in variables: setattr(new_info, attr, variables[variable_name]) diff --git a/lib/ansible/playbook/playbook_include.py b/lib/ansible/playbook/playbook_include.py index 777f81c5158..247cd3f5171 100644 --- a/lib/ansible/playbook/playbook_include.py +++ b/lib/ansible/playbook/playbook_include.py @@ -21,6 +21,8 @@ __metaclass__ = type import os +from six import iteritems + from ansible.errors import AnsibleParserError from ansible.parsing.splitter import split_args, parse_kv from ansible.parsing.yaml.objects import AnsibleBaseYAMLObject, AnsibleMapping @@ -95,7 +97,7 @@ class PlaybookInclude(Base, Conditional, Taggable): if isinstance(ds, AnsibleBaseYAMLObject): new_ds.ansible_pos = ds.ansible_pos - for (k,v) in ds.iteritems(): + for (k,v) in iteritems(ds): if k == 'include': self._preprocess_include(ds, new_ds, k, v) else: diff --git a/lib/ansible/playbook/role/__init__.py b/lib/ansible/playbook/role/__init__.py index c406bd94046..96a3f735c76 100644 --- a/lib/ansible/playbook/role/__init__.py +++ b/lib/ansible/playbook/role/__init__.py @@ -51,7 +51,7 @@ def hash_params(params): return params else: s = set() - for k,v in params.iteritems(): + for k,v in iteritems(params): if isinstance(v, dict): s.update((k, hash_params(v))) elif isinstance(v, list): @@ -105,7 +105,7 @@ class Role(Base, Become, Conditional, Taggable): params['tags'] = role_include.tags hashed_params = hash_params(params) if role_include.role in play.ROLE_CACHE: - for (entry, role_obj) in play.ROLE_CACHE[role_include.role].iteritems(): + for (entry, role_obj) in iteritems(play.ROLE_CACHE[role_include.role]): if hashed_params == entry: if parent_role: role_obj.add_parent(parent_role) diff --git a/lib/ansible/playbook/role/definition.py b/lib/ansible/playbook/role/definition.py index 2e02a723811..4f23766cd14 100644 --- a/lib/ansible/playbook/role/definition.py +++ b/lib/ansible/playbook/role/definition.py @@ -181,7 +181,7 @@ class RoleDefinition(Base, Become, Conditional, Taggable): for (key, value) in iteritems(ds): # use the list of FieldAttribute values to determine what is and is not # an extra parameter for this role (or sub-class of this role) - if key not in [attr_name for (attr_name, attr_value) in self._get_base_attributes().iteritems()]: + if key not in [attr_name for (attr_name, attr_value) in iteritems(self._get_base_attributes())]: # this key does not match a field attribute, so it must be a role param role_params[key] = value else: diff --git a/lib/ansible/playbook/task.py b/lib/ansible/playbook/task.py index a7c6b001314..fff801d3b9c 100644 --- a/lib/ansible/playbook/task.py +++ b/lib/ansible/playbook/task.py @@ -19,7 +19,7 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type -from six import string_types +from six import iteritems, string_types from ansible.errors import AnsibleError @@ -118,7 +118,7 @@ class Task(Base, Conditional, Taggable, Become): return ds elif isinstance(ds, dict): buf = "" - for (k,v) in ds.iteritems(): + for (k,v) in iteritems(ds): if k.startswith('_'): continue buf = buf + "%s=%s " % (k,v) @@ -180,7 +180,7 @@ class Task(Base, Conditional, Taggable, Become): else: new_ds['vars'] = dict() - for (k,v) in ds.iteritems(): + for (k,v) in iteritems(ds): if k in ('action', 'local_action', 'args', 'connection') or k == action or k == 'shell': # we don't want to re-assign these values, which were # determined by the ModuleArgsParser() above diff --git a/lib/ansible/plugins/action/set_fact.py b/lib/ansible/plugins/action/set_fact.py index 34f4078ac14..2e2c7bd74a8 100644 --- a/lib/ansible/plugins/action/set_fact.py +++ b/lib/ansible/plugins/action/set_fact.py @@ -18,6 +18,7 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type +from six import iteritems from ansible.errors import AnsibleError from ansible.plugins.action import ActionBase @@ -32,7 +33,7 @@ class ActionModule(ActionBase): def run(self, tmp=None, task_vars=dict()): facts = dict() if self._task.args: - for (k, v) in self._task.args.iteritems(): + for (k, v) in iteritems(self._task.args): k = self._templar.template(k) if not isidentifier(k): diff --git a/lib/ansible/plugins/cache/__init__.py b/lib/ansible/plugins/cache/__init__.py index 323d8c5ca35..f0fbcd0a3e5 100644 --- a/lib/ansible/plugins/cache/__init__.py +++ b/lib/ansible/plugins/cache/__init__.py @@ -60,7 +60,7 @@ class FactCache(MutableMapping): def copy(self): """ Return a primitive copy of the keys and values from the cache. """ - return dict([(k, v) for (k, v) in self.iteritems()]) + return dict([(k, v) for (k, v) in iteritems(self)]) def keys(self): return self._plugin.keys() diff --git a/lib/ansible/plugins/connections/paramiko_ssh.py b/lib/ansible/plugins/connections/paramiko_ssh.py index 214e6b5a03e..a3491be938e 100644 --- a/lib/ansible/plugins/connections/paramiko_ssh.py +++ b/lib/ansible/plugins/connections/paramiko_ssh.py @@ -39,6 +39,8 @@ import sys from termios import tcflush, TCIFLUSH from binascii import hexlify +from six import iteritems + from ansible import constants as C from ansible.errors import AnsibleError, AnsibleConnectionFailure, AnsibleFileNotFound from ansible.plugins.connections import ConnectionBase @@ -306,8 +308,8 @@ class Connection(ConnectionBase): def _any_keys_added(self): added_any = False - for hostname, keys in self.ssh._host_keys.iteritems(): - for keytype, key in keys.iteritems(): + for hostname, keys in iteritems(self.ssh._host_keys): + for keytype, key in iteritems(keys): added_this_time = getattr(key, '_added_by_ansible_this_time', False) if added_this_time: return True @@ -327,18 +329,18 @@ class Connection(ConnectionBase): f = open(filename, 'w') - for hostname, keys in self.ssh._host_keys.iteritems(): + for hostname, keys in iteritems(self.ssh._host_keys): - for keytype, key in keys.iteritems(): + for keytype, key in iteritems(keys): # was f.write added_this_time = getattr(key, '_added_by_ansible_this_time', False) if not added_this_time: f.write("%s %s %s\n" % (hostname, keytype, key.get_base64())) - for hostname, keys in self.ssh._host_keys.iteritems(): + for hostname, keys in iteritems(self.ssh._host_keys): - for keytype, key in keys.iteritems(): + for keytype, key in iteritems(keys): added_this_time = getattr(key, '_added_by_ansible_this_time', False) if added_this_time: f.write("%s %s %s\n" % (hostname, keytype, key.get_base64())) diff --git a/lib/ansible/plugins/filter/core.py b/lib/ansible/plugins/filter/core.py index 39303af4b6e..f6860d9f45a 100644 --- a/lib/ansible/plugins/filter/core.py +++ b/lib/ansible/plugins/filter/core.py @@ -38,6 +38,7 @@ import uuid import yaml from jinja2.filters import environmentfilter from distutils.version import LooseVersion, StrictVersion +from six import iteritems from ansible import errors from ansible.parsing.yaml.dumper import AnsibleDumper @@ -245,7 +246,7 @@ def combine(*terms, **kwargs): if recursive: return reduce(merge_hash, terms) else: - return dict(itertools.chain(*map(dict.iteritems, terms))) + return dict(itertools.chain(*map(iteritems, terms))) class FilterModule(object): ''' Ansible core jinja2 filters ''' diff --git a/lib/ansible/plugins/strategies/__init__.py b/lib/ansible/plugins/strategies/__init__.py index aabccd7eaed..ba8573801fc 100644 --- a/lib/ansible/plugins/strategies/__init__.py +++ b/lib/ansible/plugins/strategies/__init__.py @@ -20,6 +20,8 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type from six.moves import queue as Queue +from six import iteritems + import time from ansible import constants as C @@ -207,7 +209,7 @@ class StrategyBase: if task_result._task._role is not None and result[0] in ('host_task_ok', 'host_task_failed'): # lookup the role in the ROLE_CACHE to make sure we're dealing # with the correct object and mark it as executed - for (entry, role_obj) in iterator._play.ROLE_CACHE[task_result._task._role._role_name].iteritems(): + for (entry, role_obj) in iteritems(iterator._play.ROLE_CACHE[task_result._task._role._role_name]): if role_obj._uuid == task_result._task._role._uuid: role_obj._had_task_run[host.name] = True @@ -358,7 +360,7 @@ class StrategyBase: groups[group_name] = [] groups[group_name].append(host) - for group_name, hosts in groups.iteritems(): + for group_name, hosts in iteritems(groups): new_group = self._inventory.get_group(group_name) if not new_group: # create the new group and add it to inventory diff --git a/lib/ansible/plugins/strategies/linear.py b/lib/ansible/plugins/strategies/linear.py index 35c2cb50671..ad82a2b8aa2 100644 --- a/lib/ansible/plugins/strategies/linear.py +++ b/lib/ansible/plugins/strategies/linear.py @@ -19,6 +19,8 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type +from six import iteritems + from ansible.errors import AnsibleError from ansible.executor.play_iterator import PlayIterator from ansible.playbook.block import Block @@ -63,7 +65,7 @@ class StrategyModule(StrategyBase): lowest_cur_block = len(iterator._blocks) display.debug("counting tasks in each state of execution") - for (k, v) in host_tasks.iteritems(): + for (k, v) in iteritems(host_tasks): if v is None: continue diff --git a/lib/ansible/template/vars.py b/lib/ansible/template/vars.py index 8f9af9506b0..08a5ce1a8e7 100644 --- a/lib/ansible/template/vars.py +++ b/lib/ansible/template/vars.py @@ -19,6 +19,7 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type +from six import iteritems from jinja2.utils import missing __all__ = ['AnsibleJ2Vars'] @@ -46,7 +47,7 @@ class AnsibleJ2Vars: self._extras = extras self._locals = dict() if isinstance(locals, dict): - for key, val in locals.iteritems(): + for key, val in iteritems(locals): if key[:2] == 'l_' and val is not missing: self._locals[key[2:]] = val diff --git a/test/units/vars/test_variable_manager.py b/test/units/vars/test_variable_manager.py index 0d8e0770e98..18454bf4447 100644 --- a/test/units/vars/test_variable_manager.py +++ b/test/units/vars/test_variable_manager.py @@ -19,6 +19,8 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type +from six import iteritems + from ansible.compat.tests import unittest from ansible.compat.tests.mock import patch, MagicMock @@ -57,7 +59,7 @@ class TestVariableManager(unittest.TestCase): vars = v.get_vars(loader=fake_loader, use_cache=False) - for (key, val) in extra_vars.iteritems(): + for (key, val) in iteritems(extra_vars): self.assertEqual(vars.get(key), val) self.assertIsNot(v.extra_vars, extra_vars)