summaryrefslogtreecommitdiff
path: root/lib/ansible/parsing/__init__.py
diff options
context:
space:
mode:
authorToshio Kuratomi <toshio@fedoraproject.org>2015-10-15 17:55:23 -0700
committerToshio Kuratomi <toshio@fedoraproject.org>2015-10-16 08:21:28 -0700
commitbaa309309d4041678bac4352da62a3b555b4fd49 (patch)
treecb863a297bb37d9beac11a850ca0f8c785f55f71 /lib/ansible/parsing/__init__.py
parent28c933ce5eff7de7f9fea538f52620d7a86b9895 (diff)
downloadansible-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/parsing/__init__.py')
-rw-r--r--lib/ansible/parsing/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ansible/parsing/__init__.py b/lib/ansible/parsing/__init__.py
index 305b018be7..8c1833f037 100644
--- a/lib/ansible/parsing/__init__.py
+++ b/lib/ansible/parsing/__init__.py
@@ -26,7 +26,7 @@ import stat
import subprocess
from yaml import load, YAMLError
-from six import text_type, string_types
+from ansible.compat.six import text_type, string_types
from ansible.errors import AnsibleFileNotFound, AnsibleParserError, AnsibleError
from ansible.errors.yaml_strings import YAML_SYNTAX_ERROR