diff options
Diffstat (limited to 'lib/ansible/plugins/filter/core.py')
| -rw-r--r-- | lib/ansible/plugins/filter/core.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ansible/plugins/filter/core.py b/lib/ansible/plugins/filter/core.py index 39303af4b6..f6860d9f45 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 ''' |