Remove collections compat from controller code.

6 files changed, 10 insertions, 7 deletions

diff --git a/lib/ansible/utils/context_objects.py b/lib/ansible/utils/context_objects.py
index 7124174958..efe15fea82 100644
--- a/lib/ansible/utils/context_objects.py
+++ b/lib/ansible/utils/context_objects.py
@@ -10,8 +10,8 @@ Hold command line arguments for use in other modules
 """
 
 from abc import ABCMeta
+from collections.abc import Container, Mapping, Sequence, Set
 
-from ansible.module_utils.common._collections_compat import (Container, Mapping, Sequence, Set)
 from ansible.module_utils.common.collections import ImmutableDict
 from ansible.module_utils.six import add_metaclass, binary_type, text_type
 from ansible.utils.singleton import Singleton
diff --git a/lib/ansible/utils/listify.py b/lib/ansible/utils/listify.py
index 89a6583cb2..4f2ae9d446 100644
--- a/lib/ansible/utils/listify.py
+++ b/lib/ansible/utils/listify.py
@@ -19,8 +19,9 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
+from collections.abc import Iterable
+
 from ansible.module_utils.six import string_types
-from ansible.module_utils.common._collections_compat import Iterable
 
 
 __all__ = ['listify_lookup_plugin_terms']
diff --git a/lib/ansible/utils/plugin_docs.py b/lib/ansible/utils/plugin_docs.py
index 31134aff3b..3499800c44 100644
--- a/lib/ansible/utils/plugin_docs.py
+++ b/lib/ansible/utils/plugin_docs.py
@@ -4,12 +4,13 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
+from collections.abc import MutableMapping, MutableSet, MutableSequence
+
 from ansible import constants as C
 from ansible.release import __version__ as ansible_version
 from ansible.errors import AnsibleError
 from ansible.module_utils.six import string_types
 from ansible.module_utils._text import to_native
-from ansible.module_utils.common._collections_compat import MutableMapping, MutableSet, MutableSequence
 from ansible.parsing.plugin_docs import read_docstring
 from ansible.parsing.yaml.loader import AnsibleLoader
 from ansible.utils.display import Display
diff --git a/lib/ansible/utils/py3compat.py b/lib/ansible/utils/py3compat.py
index 6b46b5e899..88d9fdff50 100644
--- a/lib/ansible/utils/py3compat.py
+++ b/lib/ansible/utils/py3compat.py
@@ -14,9 +14,10 @@ __metaclass__ = type
 import os
 import sys
 
+from collections.abc import MutableMapping
+
 from ansible.module_utils.six import PY3
 from ansible.module_utils._text import to_bytes, to_text
-from ansible.module_utils.common._collections_compat import MutableMapping
 
 __all__ = ('environ',)
 
diff --git a/lib/ansible/utils/unsafe_proxy.py b/lib/ansible/utils/unsafe_proxy.py
index 7ed3cffcf1..e10fa8a05e 100644
--- a/lib/ansible/utils/unsafe_proxy.py
+++ b/lib/ansible/utils/unsafe_proxy.py
@@ -53,8 +53,9 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
+from collections.abc import Mapping, Set
+
 from ansible.module_utils._text import to_bytes, to_text
-from ansible.module_utils.common._collections_compat import Mapping, Set
 from ansible.module_utils.common.collections import is_sequence
 from ansible.module_utils.six import string_types, binary_type, text_type
 from ansible.utils.native_jinja import NativeJinjaText
diff --git a/lib/ansible/utils/vars.py b/lib/ansible/utils/vars.py
index 540dd3e9ec..74bf1425b6 100644
--- a/lib/ansible/utils/vars.py
+++ b/lib/ansible/utils/vars.py
@@ -23,15 +23,14 @@ import keyword
 import random
 import uuid
 
+from collections.abc import MutableMapping, MutableSequence
 from json import dumps
 
-
 from ansible import constants as C
 from ansible import context
 from ansible.errors import AnsibleError, AnsibleOptionsError
 from ansible.module_utils.six import string_types, PY3
 from ansible.module_utils._text import to_native, to_text
-from ansible.module_utils.common._collections_compat import MutableMapping, MutableSequence
 from ansible.parsing.splitter import parse_kv