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.

lib/ansible/utils/listify.py

@@ -21,7 +21,7 @@ __metaclass__ = type
 
 from collections import Iterable
 
-from six import string_types
+from ansible.compat.six import string_types
 
 from ansible.template import Templar
 from ansible.template.safe_eval import safe_eval

lib/ansible/utils/shlex.py

@@ -18,7 +18,7 @@
 from __future__ import absolute_import
 
 import shlex
-from six import PY3
+from ansible.compat.six import PY3
 
 from ansible.utils.unicode import to_bytes, to_unicode
 

lib/ansible/utils/unicode.py

@@ -19,7 +19,7 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-from six import string_types, text_type, binary_type, PY3
+from ansible.compat.six import string_types, text_type, binary_type, PY3
 
 # to_bytes and to_unicode were written by Toshio Kuratomi for the
 # python-kitchen library https://pypi.python.org/pypi/kitchen

lib/ansible/utils/vars.py

@@ -23,7 +23,7 @@ import ast
 from json import JSONEncoder
 from collections import MutableMapping
 
-from six import iteritems, string_types
+from ansible.compat.six import iteritems, string_types
 
 from ansible import constants as C
 from ansible.errors import AnsibleError