diff options
Diffstat (limited to 'lib/ansible/executor')
-rw-r--r-- | lib/ansible/executor/module_common.py | 3 | ||||
-rw-r--r-- | lib/ansible/executor/play_iterator.py | 4 | ||||
-rw-r--r-- | lib/ansible/executor/playbook_executor.py | 3 | ||||
-rw-r--r-- | lib/ansible/executor/process/result.py | 10 | ||||
-rw-r--r-- | lib/ansible/executor/process/worker.py | 2 | ||||
-rw-r--r-- | lib/ansible/executor/task_executor.py | 2 |
6 files changed, 8 insertions, 16 deletions
diff --git a/lib/ansible/executor/module_common.py b/lib/ansible/executor/module_common.py index c7e0b1ef08..152b5dbb37 100644 --- a/lib/ansible/executor/module_common.py +++ b/lib/ansible/executor/module_common.py @@ -21,7 +21,7 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type # from python and deps -from six.moves import StringIO +from ansible.compat.six.moves import StringIO import json import os import shlex @@ -30,7 +30,6 @@ import shlex from ansible import __version__ from ansible import constants as C from ansible.errors import AnsibleError -from ansible.parsing.utils.jsonify import jsonify from ansible.utils.unicode import to_bytes REPLACER = "#<<INCLUDE_ANSIBLE_MODULE_COMMON>>" 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 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 diff --git a/lib/ansible/executor/process/result.py b/lib/ansible/executor/process/result.py index 37970f392c..57fd047b66 100644 --- a/lib/ansible/executor/process/result.py +++ b/lib/ansible/executor/process/result.py @@ -19,13 +19,10 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type -from six.moves import queue -from six import iteritems, text_type +from ansible.compat.six.moves import queue +from ansible.compat.six import iteritems, text_type import multiprocessing -import os -import signal -import sys import time import traceback @@ -37,9 +34,6 @@ try: except ImportError: HAS_ATFORK=False -from ansible.playbook.handler import Handler -from ansible.playbook.task import Task - from ansible.utils.debug import debug __all__ = ['ResultProcess'] diff --git a/lib/ansible/executor/process/worker.py b/lib/ansible/executor/process/worker.py index b91bcfc960..390efd30d9 100644 --- a/lib/ansible/executor/process/worker.py +++ b/lib/ansible/executor/process/worker.py @@ -19,7 +19,7 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type -from six.moves import queue +from ansible.compat.six.moves import queue import multiprocessing import os 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 |