diff options
author | Toshio Kuratomi <toshio@fedoraproject.org> | 2015-10-15 17:55:23 -0700 |
---|---|---|
committer | Toshio Kuratomi <toshio@fedoraproject.org> | 2015-10-16 08:21:28 -0700 |
commit | baa309309d4041678bac4352da62a3b555b4fd49 (patch) | |
tree | cb863a297bb37d9beac11a850ca0f8c785f55f71 /lib/ansible/executor/play_iterator.py | |
parent | 28c933ce5eff7de7f9fea538f52620d7a86b9895 (diff) | |
download | ansible-six-compat.tar.gz |
Bundle a new version of python-six for compatibility along with some code to make it easy for distributions to override the bunndled copy if they have a new enough version.six-compat
Diffstat (limited to 'lib/ansible/executor/play_iterator.py')
-rw-r--r-- | lib/ansible/executor/play_iterator.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ansible/executor/play_iterator.py b/lib/ansible/executor/play_iterator.py index 27b0afd5db..642d07d973 100644 --- a/lib/ansible/executor/play_iterator.py +++ b/lib/ansible/executor/play_iterator.py @@ -21,11 +21,11 @@ __metaclass__ = type import fnmatch -from six import iteritems +from ansible.compat.six import iteritems from ansible import constants as C -from ansible.errors import * +from ansible.errors import AnsibleError from ansible.playbook.block import Block from ansible.playbook.task import Task |