summaryrefslogtreecommitdiff
path: root/lib/ansible/playbook
diff options
context:
space:
mode:
Diffstat (limited to 'lib/ansible/playbook')
-rw-r--r--lib/ansible/playbook/base.py2
-rw-r--r--lib/ansible/playbook/conditional.py4
-rw-r--r--lib/ansible/playbook/play.py2
-rw-r--r--lib/ansible/playbook/play_context.py3
-rw-r--r--lib/ansible/playbook/playbook_include.py3
-rw-r--r--lib/ansible/playbook/role/__init__.py2
-rw-r--r--lib/ansible/playbook/role/definition.py2
-rw-r--r--lib/ansible/playbook/role/include.py2
-rw-r--r--lib/ansible/playbook/role/metadata.py2
-rw-r--r--lib/ansible/playbook/role/requirement.py2
-rw-r--r--lib/ansible/playbook/taggable.py2
-rw-r--r--lib/ansible/playbook/task.py2
12 files changed, 13 insertions, 15 deletions
diff --git a/lib/ansible/playbook/base.py b/lib/ansible/playbook/base.py
index 6b6fdf3fae..b4b34bd9df 100644
--- a/lib/ansible/playbook/base.py
+++ b/lib/ansible/playbook/base.py
@@ -27,7 +27,7 @@ from functools import partial
from inspect import getmembers
from io import FileIO
-from six import iteritems, string_types, text_type
+from ansible.compat.six import iteritems, string_types, text_type
from jinja2.exceptions import UndefinedError
diff --git a/lib/ansible/playbook/conditional.py b/lib/ansible/playbook/conditional.py
index acfd54e8a0..fc178e2fa1 100644
--- a/lib/ansible/playbook/conditional.py
+++ b/lib/ansible/playbook/conditional.py
@@ -20,9 +20,9 @@ from __future__ import (absolute_import, division, print_function)
__metaclass__ = type
from jinja2.exceptions import UndefinedError
-from six import text_type
-from ansible.errors import *
+from ansible.compat.six import text_type
+from ansible.errors import AnsibleError
from ansible.playbook.attribute import FieldAttribute
from ansible.template import Templar
diff --git a/lib/ansible/playbook/play.py b/lib/ansible/playbook/play.py
index f6ae213a5c..734a9d65a8 100644
--- a/lib/ansible/playbook/play.py
+++ b/lib/ansible/playbook/play.py
@@ -19,7 +19,7 @@
from __future__ import (absolute_import, division, print_function)
__metaclass__ = type
-from six import string_types
+from ansible.compat.six import string_types
from ansible.errors import AnsibleError, AnsibleParserError
diff --git a/lib/ansible/playbook/play_context.py b/lib/ansible/playbook/play_context.py
index f6794a7faf..4554a827bd 100644
--- a/lib/ansible/playbook/play_context.py
+++ b/lib/ansible/playbook/play_context.py
@@ -26,8 +26,7 @@ import random
import re
import string
-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
from ansible.playbook.attribute import Attribute, FieldAttribute
diff --git a/lib/ansible/playbook/playbook_include.py b/lib/ansible/playbook/playbook_include.py
index df474378c5..b1a7a4c633 100644
--- a/lib/ansible/playbook/playbook_include.py
+++ b/lib/ansible/playbook/playbook_include.py
@@ -21,8 +21,7 @@ __metaclass__ = type
import os
-from six import iteritems
-
+from ansible.compat.six import iteritems
from ansible.errors import AnsibleParserError
from ansible.parsing.splitter import split_args, parse_kv
from ansible.parsing.yaml.objects import AnsibleBaseYAMLObject, AnsibleMapping
diff --git a/lib/ansible/playbook/role/__init__.py b/lib/ansible/playbook/role/__init__.py
index 14f8e6e5b2..e35eaded0f 100644
--- a/lib/ansible/playbook/role/__init__.py
+++ b/lib/ansible/playbook/role/__init__.py
@@ -19,7 +19,7 @@
from __future__ import (absolute_import, division, print_function)
__metaclass__ = type
-from six import iteritems, string_types
+from ansible.compat.six import iteritems
import os
diff --git a/lib/ansible/playbook/role/definition.py b/lib/ansible/playbook/role/definition.py
index 3417768515..cf32cb8478 100644
--- a/lib/ansible/playbook/role/definition.py
+++ b/lib/ansible/playbook/role/definition.py
@@ -19,7 +19,7 @@
from __future__ import (absolute_import, division, print_function)
__metaclass__ = type
-from six import iteritems, string_types
+from ansible.compat.six import iteritems, string_types
import os
diff --git a/lib/ansible/playbook/role/include.py b/lib/ansible/playbook/role/include.py
index 0133c8dd2e..fd8e4e5d99 100644
--- a/lib/ansible/playbook/role/include.py
+++ b/lib/ansible/playbook/role/include.py
@@ -19,7 +19,7 @@
from __future__ import (absolute_import, division, print_function)
__metaclass__ = type
-from six import iteritems, string_types
+from ansible.compat.six import iteritems, string_types
import os
diff --git a/lib/ansible/playbook/role/metadata.py b/lib/ansible/playbook/role/metadata.py
index 7d84acf188..58b59145a1 100644
--- a/lib/ansible/playbook/role/metadata.py
+++ b/lib/ansible/playbook/role/metadata.py
@@ -21,7 +21,7 @@ __metaclass__ = type
import os
-from six import iteritems, string_types
+from ansible.compat.six import iteritems, string_types
from ansible.errors import AnsibleParserError
from ansible.playbook.attribute import Attribute, FieldAttribute
diff --git a/lib/ansible/playbook/role/requirement.py b/lib/ansible/playbook/role/requirement.py
index 1cb98a57fa..5de1876c31 100644
--- a/lib/ansible/playbook/role/requirement.py
+++ b/lib/ansible/playbook/role/requirement.py
@@ -19,7 +19,7 @@
from __future__ import (absolute_import, division, print_function)
__metaclass__ = type
-from six import string_types
+from ansible.compat.six import string_types
import os
import shutil
diff --git a/lib/ansible/playbook/taggable.py b/lib/ansible/playbook/taggable.py
index 1f55f95a2e..8f5cfa0934 100644
--- a/lib/ansible/playbook/taggable.py
+++ b/lib/ansible/playbook/taggable.py
@@ -20,8 +20,8 @@ from __future__ import (absolute_import, division, print_function)
__metaclass__ = type
import itertools
-from six import string_types
+from ansible.compat.six import string_types
from ansible.errors import AnsibleError
from ansible.playbook.attribute import FieldAttribute
from ansible.template import Templar
diff --git a/lib/ansible/playbook/task.py b/lib/ansible/playbook/task.py
index d65c31ac47..9ed8d9bfe9 100644
--- a/lib/ansible/playbook/task.py
+++ b/lib/ansible/playbook/task.py
@@ -19,7 +19,7 @@
from __future__ import (absolute_import, division, print_function)
__metaclass__ = type
-from six import iteritems, string_types
+from ansible.compat.six import iteritems, string_types
from ansible.errors import AnsibleError
View Lorry Controller Status