internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 21:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/plugin_utils/unsafe.py
View File

@@ -7,7 +7,6 @@ __metaclass__ = type
import re
from ansible.module_utils.six import binary_type, text_type
from collections.abc import Mapping, Set
from ansible.module_utils.common.collections import is_sequence
from ansible.utils.unsafe_proxy import (
@@ -29,11 +28,11 @@ def make_unsafe(value):
return set(make_unsafe(elt) for elt in value)
elif is_sequence(value):
return type(value)(make_unsafe(elt) for elt in value)
elif isinstance(value, binary_type):
elif isinstance(value, bytes):
if _RE_TEMPLATE_CHARS_BYTES.search(value):
value = _make_unsafe(value)
return value
elif isinstance(value, text_type):
elif isinstance(value, str):
if _RE_TEMPLATE_CHARS.search(value):
value = _make_unsafe(value)
return value