summaryrefslogtreecommitdiff
path: root/lib/ansible/executor/task_executor.py
diff options
context:
space:
mode:
authorToshio Kuratomi <toshio@fedoraproject.org>2015-10-15 17:55:23 -0700
committerToshio Kuratomi <toshio@fedoraproject.org>2015-10-16 08:21:28 -0700
commitbaa309309d4041678bac4352da62a3b555b4fd49 (patch)
treecb863a297bb37d9beac11a850ca0f8c785f55f71 /lib/ansible/executor/task_executor.py
parent28c933ce5eff7de7f9fea538f52620d7a86b9895 (diff)
downloadansible-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/task_executor.py')
-rw-r--r--lib/ansible/executor/task_executor.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ansible/executor/task_executor.py b/lib/ansible/executor/task_executor.py
index 99e12acb14..6fb45467e4 100644
--- a/lib/ansible/executor/task_executor.py
+++ b/lib/ansible/executor/task_executor.py
@@ -25,7 +25,7 @@ import subprocess
import sys
import time
-from six import iteritems
+from ansible.compat.six import iteritems
from ansible import constants as C
from ansible.errors import AnsibleError, AnsibleParserError, AnsibleUndefinedVariable, AnsibleConnectionFailure