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/playbook_executor.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/playbook_executor.py')
| -rw-r--r-- | lib/ansible/executor/playbook_executor.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/ansible/executor/playbook_executor.py b/lib/ansible/executor/playbook_executor.py index 34752f58e7..cbea7050f7 100644 --- a/lib/ansible/executor/playbook_executor.py +++ b/lib/ansible/executor/playbook_executor.py @@ -25,7 +25,7 @@ import os import signal import sys -from six import string_types +from ansible.compat.six import string_types from ansible import constants as C from ansible.executor.task_queue_manager import TaskQueueManager @@ -33,7 +33,6 @@ from ansible.playbook import Playbook from ansible.template import Templar from ansible.utils.color import colorize, hostcolor -from ansible.utils.debug import debug from ansible.utils.encrypt import do_encrypt from ansible.utils.unicode import to_unicode |