[PR #10873/6cd46654 backport][stable-11] Avoid six in plugin code (#10875)

Avoid six in plugin code (#10873)

Avoid six in plugin code.

(cherry picked from commit 6cd4665412)

Co-authored-by: Felix Fontein <felix@fontein.de>
This commit is contained in:
patchback[bot]
2025-10-05 07:36:47 +02:00
committed by GitHub
parent 3b207ba0fd
commit 1e01aeacb4
34 changed files with 70 additions and 120 deletions

View File

@@ -27,7 +27,6 @@ try:
except ImportError:
pass
from ansible.module_utils.six import binary_type, text_type
from collections.abc import MutableMapping, MutableSequence
from ansible.plugins.callback.default import CallbackModule as CallbackModule_default
from ansible.utils.color import colorize, hostcolor
@@ -236,7 +235,7 @@ class CallbackModule(CallbackModule_default):
# Remove empty attributes (list, dict, str)
for attr in result.copy():
if isinstance(result[attr], (MutableSequence, MutableMapping, binary_type, text_type)):
if isinstance(result[attr], (MutableSequence, MutableMapping, bytes, str)):
if not result[attr]:
del result[attr]