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

1 files changed, 2 insertions, 8 deletions

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']