diff options
author | OpenShift Bot <dmcphers+openshiftbot@redhat.com> | 2017-03-10 09:25:00 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-10 09:25:00 -0500 |
commit | 23ba89e0a51c7b34813da2d47e8735cd996e46c1 (patch) | |
tree | e89108792044461343b6fc8d40e5a31c0c1434ae /filter_plugins/oo_filters.py | |
parent | f36f78c63762f1764f25e135e576ca619a9ba7d3 (diff) | |
parent | 1100f5a76dff38a1f191f7b3ae42ec13bfc3c43e (diff) | |
download | openshift-23ba89e0a51c7b34813da2d47e8735cd996e46c1.tar.gz openshift-23ba89e0a51c7b34813da2d47e8735cd996e46c1.tar.bz2 openshift-23ba89e0a51c7b34813da2d47e8735cd996e46c1.tar.xz openshift-23ba89e0a51c7b34813da2d47e8735cd996e46c1.zip |
Merge pull request #3613 from detiber/module_utils_six
Merged by openshift-bot
Diffstat (limited to 'filter_plugins/oo_filters.py')
-rw-r--r-- | filter_plugins/oo_filters.py | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/filter_plugins/oo_filters.py b/filter_plugins/oo_filters.py index ed6923687..a619f9ccb 100644 --- a/filter_plugins/oo_filters.py +++ b/filter_plugins/oo_filters.py @@ -1,26 +1,32 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # vim: expandtab:tabstop=4:shiftwidth=4 -# pylint: disable=no-name-in-module, import-error, wrong-import-order, ungrouped-imports """ Custom filters for use in openshift-ansible """ +import json import os import pdb -import pkg_resources -import re -import json -import yaml import random +import re -from ansible import errors from collections import Mapping -from distutils.util import strtobool -from distutils.version import LooseVersion +# pylint no-name-in-module and import-error disabled here because pylint +# fails to properly detect the packages when installed in a virtualenv +from distutils.util import strtobool # pylint:disable=no-name-in-module,import-error +from distutils.version import LooseVersion # pylint:disable=no-name-in-module,import-error from operator import itemgetter -from ansible.module_utils.six.moves.urllib.parse import urlparse + +import pkg_resources +import yaml + +from ansible import errors +# pylint no-name-in-module and import-error disabled here because pylint +# fails to properly detect the packages when installed in a virtualenv +from ansible.compat.six import string_types # pylint:disable=no-name-in-module,import-error +from ansible.compat.six.moves.urllib.parse import urlparse # pylint:disable=no-name-in-module,import-error +from ansible.module_utils._text import to_text from ansible.parsing.yaml.dumper import AnsibleDumper -from six import string_types HAS_OPENSSL = False try: @@ -29,15 +35,6 @@ try: except ImportError: pass -try: - # ansible-2.2 - # ansible.utils.unicode.to_unicode is deprecated in ansible-2.2, - # ansible.module_utils._text.to_text should be used instead. - from ansible.module_utils._text import to_text -except ImportError: - # ansible-2.1 - from ansible.utils.unicode import to_unicode as to_text - def oo_pdb(arg): """ This pops you into a pdb instance where arg is the data passed in @@ -117,8 +114,7 @@ def oo_merge_hostvars(hostvars, variables, inventory_hostname): raise errors.AnsibleFilterError("|failed expects variables is a dictionary") if not isinstance(inventory_hostname, string_types): raise errors.AnsibleFilterError("|failed expects inventory_hostname is a string") - # pylint: disable=no-member - ansible_version = pkg_resources.get_distribution("ansible").version + ansible_version = pkg_resources.get_distribution("ansible").version # pylint: disable=maybe-no-member merged_hostvars = {} if LooseVersion(ansible_version) >= LooseVersion('2.0.0'): merged_hostvars = oo_merge_dicts( |