diff options
| author | Matt Clay <matt@mystile.com> | 2023-02-04 01:22:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-04 01:22:40 +0100 |
| commit | 379058e10f3dbc0fdcaf80394bd09b18927e7d33 (patch) | |
| tree | 71d411345c6c140a65c49131e50632d4f9cef363 /test/support | |
| parent | ansible-test - Enable pylint unused-import for core (#79910) (diff) | |
| download | ansible-379058e10f3dbc0fdcaf80394bd09b18927e7d33.tar.xz ansible-379058e10f3dbc0fdcaf80394bd09b18927e7d33.zip | |
Update collections.abc imports (#79911)
* Update `collections.abc` imports
- Use `six.moves` for modules and module_utils
- Use `collections.abc` for controller code
This avoids using `ansible.module_utils.common._collections_compat`,
which was added before the vendored `six` was updated to provide these
imports.
* Update _collections_compat to use six.moves
Also update the custom pylint rule to reflect this change.
Diffstat (limited to 'test/support')
2 files changed, 2 insertions, 2 deletions
diff --git a/test/support/integration/plugins/module_utils/network/common/utils.py b/test/support/integration/plugins/module_utils/network/common/utils.py index 8031738781..b15f9015d7 100644 --- a/test/support/integration/plugins/module_utils/network/common/utils.py +++ b/test/support/integration/plugins/module_utils/network/common/utils.py @@ -37,7 +37,7 @@ import json from itertools import chain from ansible.module_utils._text import to_text, to_bytes -from ansible.module_utils.common._collections_compat import Mapping +from ansible.module_utils.six.moves.collections_abc import Mapping from ansible.module_utils.six import iteritems, string_types from ansible.module_utils import basic from ansible.module_utils.parsing.convert_bool import boolean diff --git a/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/module_utils/network/common/utils.py b/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/module_utils/network/common/utils.py index 64eca15763..47b3b0aca0 100644 --- a/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/module_utils/network/common/utils.py +++ b/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/module_utils/network/common/utils.py @@ -37,7 +37,7 @@ import json from itertools import chain from ansible.module_utils._text import to_text, to_bytes -from ansible.module_utils.common._collections_compat import Mapping +from ansible.module_utils.six.moves.collections_abc import Mapping from ansible.module_utils.six import iteritems, string_types from ansible.module_utils import basic from ansible.module_utils.parsing.convert_bool import boolean |