ansible-core 2.20: avoid deprecated functionality (#10687)

Avoid deprecated functionality.

Author: felixfontein

changelogs/fragments/10687-deprecations.yml

@@ -0,0 +1,2 @@
+bugfixes:
+  - "Avoid deprecated functionality in ansible-core 2.20 (https://github.com/ansible-collections/community.general/pull/10687)."

plugins/become/machinectl.py

@@ -94,7 +94,7 @@
 from re import compile as re_compile
 
 from ansible.plugins.become import BecomeBase
-from ansible.module_utils._text import to_bytes
+from ansible.module_utils.common.text.converters import to_bytes
 
 
 ansi_color_codes = re_compile(to_bytes(r'\x1B\[[0-9;]+m'))

plugins/become/run0.py

@@ -80,7 +80,7 @@
 from re import compile as re_compile
 
 from ansible.plugins.become import BecomeBase
-from ansible.module_utils._text import to_bytes
+from ansible.module_utils.common.text.converters import to_bytes
 
 ansi_color_codes = re_compile(to_bytes(r"\x1B\[[0-9;]+m"))
 

plugins/cache/memcached.py

@@ -54,7 +54,7 @@
 from itertools import chain
 
 from ansible.errors import AnsibleError
-from ansible.module_utils.common._collections_compat import MutableSet
+from collections.abc import MutableSet
 from ansible.plugins.cache import BaseCacheModule
 from ansible.utils.display import Display
 

plugins/callback/dense.py

@@ -28,7 +28,7 @@
     pass
 
 from ansible.module_utils.six import binary_type, text_type
-from ansible.module_utils.common._collections_compat import MutableMapping, MutableSequence
+from collections.abc import MutableMapping, MutableSequence
 from ansible.plugins.callback.default import CallbackModule as CallbackModule_default
 from ansible.utils.color import colorize, hostcolor
 from ansible.utils.display import Display

plugins/callback/log_plays.py

@@ -34,7 +34,7 @@
 
 from ansible.utils.path import makedirs_safe
 from ansible.module_utils.common.text.converters import to_bytes
-from ansible.module_utils.common._collections_compat import MutableMapping
+from collections.abc import MutableMapping
 from ansible.parsing.ajson import AnsibleJSONEncoder
 from ansible.plugins.callback import CallbackBase
 

plugins/connection/incus.py

@@ -80,7 +80,7 @@
 
 from ansible.errors import AnsibleError, AnsibleConnectionFailure, AnsibleFileNotFound
 from ansible.module_utils.common.process import get_bin_path
-from ansible.module_utils._text import to_bytes, to_text
+from ansible.module_utils.common.text.converters import to_bytes, to_text
 from ansible.plugins.connection import ConnectionBase
 
 

plugins/filter/counter.py

@@ -36,7 +36,7 @@
 """
 
 from ansible.errors import AnsibleFilterError
-from ansible.module_utils.common._collections_compat import Sequence
+from collections.abc import Sequence
 from collections import Counter
 
 

plugins/filter/groupby_as_dict.py

@@ -54,7 +54,7 @@
 """
 
 from ansible.errors import AnsibleFilterError
-from ansible.module_utils.common._collections_compat import Mapping, Sequence
+from collections.abc import Mapping, Sequence
 
 
 def groupby_as_dict(sequence, attribute):

plugins/filter/lists_mergeby.py

@@ -197,7 +197,7 @@
 
 from ansible.errors import AnsibleFilterError
 from ansible.module_utils.six import string_types
-from ansible.module_utils.common._collections_compat import Mapping, Sequence
+from collections.abc import Mapping, Sequence
 from ansible.utils.vars import merge_hash
 
 from collections import defaultdict