diff options
| author | Scott Dodson <sdodson@redhat.com> | 2018-01-17 10:52:22 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-17 10:52:22 -0500 |
| commit | 2e1a1328457315c0d434d5a0fe1660e07512f6bd (patch) | |
| tree | a0efd99770819064d56e7cf272957e3ec02aadd3 /roles | |
| parent | 6c6529d4f08b3b69ff166f05a526e572467dda01 (diff) | |
| parent | adb0ce309b92de60afd028a72e2e80cf165430b7 (diff) | |
| download | openshift-2e1a1328457315c0d434d5a0fe1660e07512f6bd.tar.gz openshift-2e1a1328457315c0d434d5a0fe1660e07512f6bd.tar.bz2 openshift-2e1a1328457315c0d434d5a0fe1660e07512f6bd.tar.xz openshift-2e1a1328457315c0d434d5a0fe1660e07512f6bd.zip | |
Merge pull request #6588 from vrutkovs/remove-ansible-compat-six
Don't use from ansible.module_utils.six as its no longer available in Ansible 2.4
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/lib_utils/filter_plugins/oo_filters.py | 11 | ||||
| -rw-r--r-- | roles/lib_utils/filter_plugins/openshift_master.py | 6 |
2 files changed, 5 insertions, 12 deletions
diff --git a/roles/lib_utils/filter_plugins/oo_filters.py b/roles/lib_utils/filter_plugins/oo_filters.py index fc14b5633..9f73510c4 100644 --- a/roles/lib_utils/filter_plugins/oo_filters.py +++ b/roles/lib_utils/filter_plugins/oo_filters.py @@ -21,13 +21,10 @@ import yaml 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: diff --git a/roles/lib_utils/filter_plugins/openshift_master.py b/roles/lib_utils/filter_plugins/openshift_master.py index ff15f693b..e67b19c28 100644 --- a/roles/lib_utils/filter_plugins/openshift_master.py +++ b/roles/lib_utils/filter_plugins/openshift_master.py @@ -10,11 +10,7 @@ from ansible import errors 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 |