From 68ac6fecb18272ddf58f189a3fe2d707b77677b6 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Sun, 17 Aug 2025 20:15:40 +0200 Subject: [PATCH] Avoid deprecated functionality. (#1117) --- changelogs/fragments/1117-deprecations.yml | 2 ++ plugins/module_utils/common.py | 2 +- plugins/module_utils/common_api.py | 2 +- plugins/modules/docker_container_copy_into.py | 2 +- plugins/plugin_utils/unsafe.py | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 changelogs/fragments/1117-deprecations.yml diff --git a/changelogs/fragments/1117-deprecations.yml b/changelogs/fragments/1117-deprecations.yml new file mode 100644 index 00000000..8639b2b3 --- /dev/null +++ b/changelogs/fragments/1117-deprecations.yml @@ -0,0 +1,2 @@ +bugfixes: + - "Avoid deprecated functionality in ansible-core 2.20 (https://github.com/ansible-collections/community.docker/pull/1117)." diff --git a/plugins/module_utils/common.py b/plugins/module_utils/common.py index ed282d5b..8752b1ab 100644 --- a/plugins/module_utils/common.py +++ b/plugins/module_utils/common.py @@ -14,7 +14,7 @@ import sys import traceback from ansible.module_utils.basic import AnsibleModule, missing_required_lib -from ansible.module_utils.common._collections_compat import Mapping, Sequence +from ansible.module_utils.six.moves.collections_abc import Mapping, Sequence from ansible.module_utils.six import string_types from ansible.module_utils.parsing.convert_bool import BOOLEANS_TRUE, BOOLEANS_FALSE diff --git a/plugins/module_utils/common_api.py b/plugins/module_utils/common_api.py index 9008683e..64b612d1 100644 --- a/plugins/module_utils/common_api.py +++ b/plugins/module_utils/common_api.py @@ -12,7 +12,7 @@ import os import re from ansible.module_utils.basic import AnsibleModule, missing_required_lib -from ansible.module_utils.common._collections_compat import Mapping, Sequence +from ansible.module_utils.six.moves.collections_abc import Mapping, Sequence from ansible.module_utils.six import string_types from ansible.module_utils.parsing.convert_bool import BOOLEANS_TRUE, BOOLEANS_FALSE diff --git a/plugins/modules/docker_container_copy_into.py b/plugins/modules/docker_container_copy_into.py index 7d2a144e..fca231d7 100644 --- a/plugins/modules/docker_container_copy_into.py +++ b/plugins/modules/docker_container_copy_into.py @@ -171,7 +171,7 @@ import os import stat import traceback -from ansible.module_utils._text import to_bytes, to_native, to_text +from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text from ansible.module_utils.common.validation import check_type_int from ansible.module_utils.six import integer_types, string_types diff --git a/plugins/plugin_utils/unsafe.py b/plugins/plugin_utils/unsafe.py index 1eb61bea..9280d072 100644 --- a/plugins/plugin_utils/unsafe.py +++ b/plugins/plugin_utils/unsafe.py @@ -8,7 +8,7 @@ __metaclass__ = type import re from ansible.module_utils.six import binary_type, text_type -from ansible.module_utils.common._collections_compat import Mapping, Set +from collections.abc import Mapping, Set from ansible.module_utils.common.collections import is_sequence from ansible.utils.unsafe_proxy import ( AnsibleUnsafe,