diff --git a/.zuul.yaml b/.zuul.yaml index f58bf25..babf280 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,13 +1,13 @@ - project: check: jobs: - - ansible-test-sanity: - voting: False + - ansible-test-sanity - ansible-role-tests-devel-py2 - ansible-role-tests-2.7-py2 - ansible-role-tests-2.7-py3 gate: jobs: + - ansible-test-sanity - ansible-role-tests-devel-py3 - ansible-role-tests-2.7-py2 - ansible-role-tests-2.7-py3 diff --git a/action_plugins/command_parser.py b/action_plugins/command_parser.py index fe7c47a..fcda86c 100644 --- a/action_plugins/command_parser.py +++ b/action_plugins/command_parser.py @@ -9,10 +9,10 @@ import os import sys -import collections from ansible import constants as C from ansible.plugins.action import ActionBase +from ansible.module_utils.common._collections_compat import Iterable from ansible.module_utils.common._collections_compat import Mapping from ansible.module_utils.six import iteritems, string_types from ansible.module_utils._text import to_text @@ -342,7 +342,7 @@ def do_pattern_group(self, block): raise AnsibleError('invalid directive specified') if 'pattern_group' in task: - if loop and isinstance(loop, collections.Iterable) and not isinstance(loop, string_types): + if loop and isinstance(loop, Iterable) and not isinstance(loop, string_types): res = list() for loop_item in loop: self.ds[loop_var] = loop_item @@ -355,7 +355,7 @@ def do_pattern_group(self, block): if register: registers[register] = res - elif isinstance(loop, collections.Iterable) and not isinstance(loop, string_types): + elif isinstance(loop, Iterable) and not isinstance(loop, string_types): loop_result = list() for loop_item in loop: diff --git a/library/net_facts.py b/library/net_facts.py index 78c8326..2bd37bb 100644 --- a/library/net_facts.py +++ b/library/net_facts.py @@ -1,6 +1,9 @@ #!/usr/bin/python # -*- coding: utf-8 -*- +from __future__ import (absolute_import, division, print_function) +__metaclass__ = type + # (c) 2018, Red Hat, Inc. # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) diff --git a/lookup_plugins/network_template.py b/lookup_plugins/network_template.py index af9f0d5..dfffa12 100644 --- a/lookup_plugins/network_template.py +++ b/lookup_plugins/network_template.py @@ -32,10 +32,8 @@ description: file(s) content after templating """ - -import collections - from ansible.plugins.lookup import LookupBase, display +from ansible.module_utils.common._collections_compat import Iterable from ansible.module_utils.common._collections_compat import Mapping from ansible.module_utils.network.common.utils import to_list from ansible.module_utils.six import iteritems, string_types @@ -83,7 +81,7 @@ def run(self, terms, variables, **kwargs): if res: loop_result.extend(to_list(res)) - elif isinstance(loop, collections.Iterable) and not isinstance(loop, string_types): + elif isinstance(loop, Iterable) and not isinstance(loop, string_types): for loop_item in loop: self.ds['item'] = loop_item res = self._process_directive(task) @@ -138,7 +136,7 @@ def do_context(self, block): loop_result.extend(to_list(self._process_directive(task))) results.extend(loop_result) - elif isinstance(loop, collections.Iterable) and not isinstance(loop, string_types): + elif isinstance(loop, Iterable) and not isinstance(loop, string_types): loop_result = list() for loop_item in loop: self.ds['item'] = loop_item @@ -225,7 +223,7 @@ def template(self, data, variables, convert_bare=False): templated_data[templated_key] = self.template(value, variables, convert_bare=convert_bare) return templated_data - elif isinstance(data, collections.Iterable) and not isinstance(data, string_types): + elif isinstance(data, Iterable) and not isinstance(data, string_types): return [self.template(i, variables, convert_bare=convert_bare) for i in data] else: