diff --git a/action_plugins/command_parser.py b/action_plugins/command_parser.py index c5ac645..34c8ecf 100644 --- a/action_plugins/command_parser.py +++ b/action_plugins/command_parser.py @@ -9,11 +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 Mapping +from ansible.module_utils.common._collections_compat import Iterable, Mapping from ansible.module_utils.six import iteritems, iterkeys, string_types from ansible.module_utils._text import to_text from ansible.errors import AnsibleError @@ -344,7 +343,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 @@ -357,7 +356,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/lookup_plugins/network_template.py b/lookup_plugins/network_template.py index 97307dd..cadeee7 100644 --- a/lookup_plugins/network_template.py +++ b/lookup_plugins/network_template.py @@ -33,10 +33,8 @@ """ -import collections - from ansible.plugins.lookup import LookupBase, display -from ansible.module_utils.common._collections_compat import Mapping +from ansible.module_utils.common._collections_compat import Iterable, Mapping from ansible.module_utils.network.common.utils import to_list from ansible.module_utils.six import iteritems, string_types from ansible.module_utils._text import to_text, to_bytes @@ -90,7 +88,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) @@ -146,7 +144,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 @@ -233,7 +231,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: