diff options
| author | Toshio Kuratomi <toshio@fedoraproject.org> | 2015-10-15 17:55:23 -0700 |
|---|---|---|
| committer | Toshio Kuratomi <toshio@fedoraproject.org> | 2015-10-16 08:21:28 -0700 |
| commit | baa309309d4041678bac4352da62a3b555b4fd49 (patch) | |
| tree | cb863a297bb37d9beac11a850ca0f8c785f55f71 /lib/ansible/executor/module_common.py | |
| parent | 28c933ce5eff7de7f9fea538f52620d7a86b9895 (diff) | |
| download | ansible-six-compat.tar.gz | |
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
Diffstat (limited to 'lib/ansible/executor/module_common.py')
| -rw-r--r-- | lib/ansible/executor/module_common.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/ansible/executor/module_common.py b/lib/ansible/executor/module_common.py index c7e0b1ef08..152b5dbb37 100644 --- a/lib/ansible/executor/module_common.py +++ b/lib/ansible/executor/module_common.py @@ -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>>" |