Skip to content

Don't use from ansible.module_utils.six as its no longer available in Ansible 2.4 #6588

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 17, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions roles/lib_utils/filter_plugins/oo_filters.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,10 @@
from ansible import errors
from ansible.parsing.yaml.dumper import AnsibleDumper

# ansible.compat.six goes away with Ansible 2.4
try:
from ansible.compat.six import string_types, u
from ansible.compat.six.moves.urllib.parse import urlparse
except ImportError:
from ansible.module_utils.six import string_types, u
from ansible.module_utils.six.moves.urllib.parse import urlparse
# pylint: disable=import-error,no-name-in-module
from ansible.module_utils.six import string_types, u
# pylint: disable=import-error,no-name-in-module
from ansible.module_utils.six.moves.urllib.parse import urlparse

HAS_OPENSSL = False
try:
Expand Down
6 changes: 1 addition & 5 deletions roles/lib_utils/filter_plugins/openshift_master.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,7 @@
from ansible.parsing.yaml.dumper import AnsibleDumper
from ansible.plugins.filter.core import to_bool as ansible_bool

# ansible.compat.six goes away with Ansible 2.4
try:
from ansible.compat.six import string_types, u
except ImportError:
from ansible.module_utils.six import string_types, u
from ansible.module_utils.six import string_types, u

import yaml

Expand Down
6 changes: 1 addition & 5 deletions utils/src/ooinstall/ansible_plugins/facts_callback.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,7 @@
from ansible.plugins.callback import CallbackBase
from ansible.parsing.yaml.dumper import AnsibleDumper

# ansible.compat.six goes away with Ansible 2.4
try:
from ansible.compat.six import u
except ImportError:
from ansible.module_utils.six import u
from ansible.module_utils.six import u


# pylint: disable=super-init-not-called
Expand Down