summaryrefslogtreecommitdiff
path: root/test/units/module_utils
diff options
context:
space:
mode:
authorMatt Clay <matt@mystile.com>2023-02-03 16:22:40 -0800
committerGitHub <noreply@github.com>2023-02-03 16:22:40 -0800
commit379058e10f3dbc0fdcaf80394bd09b18927e7d33 (patch)
tree71d411345c6c140a65c49131e50632d4f9cef363 /test/units/module_utils
parente658995760ac1209cb12df97027a2e282b4536ae (diff)
downloadansible-379058e10f3dbc0fdcaf80394bd09b18927e7d33.tar.gz
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/units/module_utils')
-rw-r--r--test/units/module_utils/common/test_collections.py2
-rw-r--r--test/units/module_utils/conftest.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/units/module_utils/common/test_collections.py b/test/units/module_utils/common/test_collections.py
index 95b2a402f2..72913edb14 100644
--- a/test/units/module_utils/common/test_collections.py
+++ b/test/units/module_utils/common/test_collections.py
@@ -9,7 +9,7 @@ __metaclass__ = type
import pytest
from ansible.module_utils.six import Iterator
-from ansible.module_utils.common._collections_compat import Sequence
+from ansible.module_utils.six.moves.collections_abc import Sequence
from ansible.module_utils.common.collections import ImmutableDict, is_iterable, is_sequence
diff --git a/test/units/module_utils/conftest.py b/test/units/module_utils/conftest.py
index 8bc13c4d55..dc810652c7 100644
--- a/test/units/module_utils/conftest.py
+++ b/test/units/module_utils/conftest.py
@@ -13,7 +13,7 @@ import pytest
import ansible.module_utils.basic
from ansible.module_utils.six import PY3, string_types
from ansible.module_utils._text import to_bytes
-from ansible.module_utils.common._collections_compat import MutableMapping
+from ansible.module_utils.six.moves.collections_abc import MutableMapping
@pytest.fixture