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

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