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.

This commit is contained in:
Toshio Kuratomi 2015-10-15 17:55:23 -07:00
parent 28c933ce5e
commit baa309309d
54 changed files with 1017 additions and 84 deletions

View file

@ -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