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/plugins/action/__init__.py

@@ -28,7 +28,7 @@ import stat
 import tempfile
 import time
 
-from six import binary_type, text_type, iteritems
+from ansible.compat.six import binary_type, text_type, iteritems
 
 from ansible import constants as C
 from ansible.errors import AnsibleError, AnsibleConnectionFailure

lib/ansible/plugins/action/set_fact.py

@@ -18,7 +18,7 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-from six import iteritems
+from ansible.compat.six import iteritems
 
 from ansible.errors import AnsibleError
 from ansible.plugins.action import ActionBase

lib/ansible/plugins/cache/base.py

@@ -20,7 +20,7 @@ __metaclass__ = type
 
 from abc import ABCMeta, abstractmethod
 
-from six import with_metaclass
+from ansible.compat.six import with_metaclass
 
 try:
     from __main__ import display

lib/ansible/plugins/callback/__init__.py

@@ -24,7 +24,7 @@ import difflib
 import warnings
 from copy import deepcopy
 
-from six import string_types
+from ansible.compat.six import string_types
 
 from ansible import constants as C
 from ansible.utils.unicode import to_unicode

lib/ansible/plugins/connection/__init__.py

@@ -27,7 +27,7 @@ import os
 from abc import ABCMeta, abstractmethod, abstractproperty
 
 from functools import wraps
-from six import with_metaclass
+from ansible.compat.six import with_metaclass
 
 from ansible import constants as C
 from ansible.errors import AnsibleError

lib/ansible/plugins/connection/paramiko_ssh.py

@@ -39,7 +39,7 @@ import sys
 from termios import tcflush, TCIFLUSH
 from binascii import hexlify
 
-from six import iteritems
+from ansible.compat.six import iteritems
 
 from ansible import constants as C
 from ansible.errors import AnsibleError, AnsibleConnectionFailure, AnsibleFileNotFound

lib/ansible/plugins/connection/winrm.py

@@ -25,7 +25,7 @@ import re
 import shlex
 import traceback
 
-from six.moves.urllib.parse import urlunsplit
+from ansible.compat.six.moves.urllib.parse import urlunsplit
 
 from ansible.errors import AnsibleError
 try:

lib/ansible/plugins/filter/core.py

@@ -38,7 +38,7 @@ import uuid
 import yaml
 from jinja2.filters import environmentfilter
 from distutils.version import LooseVersion, StrictVersion
-from six import iteritems
+from ansible.compat.six import iteritems
 
 from ansible import errors
 from ansible.parsing.yaml.dumper import AnsibleDumper

lib/ansible/plugins/inventory/__init__.py

@@ -23,7 +23,7 @@ __metaclass__ = type
 
 from abc import ABCMeta, abstractmethod
 
-from six import with_metaclass
+from ansible.compat.six import with_metaclass
 
 class InventoryParser(with_metaclass(ABCMeta, object)):
     '''Abstract Base Class for retrieving inventory information

lib/ansible/plugins/lookup/__init__.py

@@ -21,7 +21,7 @@ __metaclass__ = type
 
 from abc import ABCMeta, abstractmethod
 
-from six import with_metaclass
+from ansible.compat.six import with_metaclass
 
 try:
     from __main__ import display

lib/ansible/plugins/shell/sh.py

@@ -24,7 +24,7 @@ import ansible.constants as C
 import time
 import random
 
-from six import text_type
+from ansible.compat.six import text_type
 
 _USER_HOME_PATH_RE = re.compile(r'^~[_.A-Za-z0-9][-_.A-Za-z0-9]*$')
 

lib/ansible/plugins/strategy/__init__.py

@@ -19,8 +19,8 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-from six.moves import queue as Queue
-from six import iteritems, text_type
+from ansible.compat.six.moves import queue as Queue
+from ansible.compat.six import iteritems, text_type
 
 import time
 

lib/ansible/plugins/strategy/linear.py

@@ -19,7 +19,7 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-from six import iteritems, text_type
+from ansible.compat.six import iteritems, text_type
 
 from ansible.errors import AnsibleError
 from ansible.executor.play_iterator import PlayIterator