diff options
| -rw-r--r-- | lib/ansible/utils/unsafe_proxy.py | 38 |
1 files changed, 12 insertions, 26 deletions
diff --git a/lib/ansible/utils/unsafe_proxy.py b/lib/ansible/utils/unsafe_proxy.py index 7da74dcfb2..7f9593f478 100644 --- a/lib/ansible/utils/unsafe_proxy.py +++ b/lib/ansible/utils/unsafe_proxy.py @@ -57,7 +57,6 @@ from collections.abc import Mapping, Set from ansible.module_utils._text import to_bytes, to_text 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 @@ -68,12 +67,12 @@ class AnsibleUnsafe(object): __UNSAFE__ = True -class AnsibleUnsafeBytes(binary_type, AnsibleUnsafe): +class AnsibleUnsafeBytes(bytes, AnsibleUnsafe): def _strip_unsafe(self): return super().__bytes__() def __str__(self, /): # pylint: disable=invalid-str-returned - return self.encode() + return self.decode() def __bytes__(self, /): # pylint: disable=invalid-bytes-returned return self @@ -82,7 +81,7 @@ class AnsibleUnsafeBytes(binary_type, AnsibleUnsafe): return AnsibleUnsafeText(super().__repr__()) def __format__(self, format_spec, /): # pylint: disable=invalid-format-returned - return self.__class__(super().__format__(format_spec)) + return AnsibleUnsafeText(super().__format__(format_spec)) def __getitem__(self, key, /): return self.__class__(super().__getitem__(key)) @@ -114,9 +113,6 @@ class AnsibleUnsafeBytes(binary_type, AnsibleUnsafe): def capitalize(self, /): return self.__class__(super().capitalize()) - def casefold(self, /): - return self.__class__(super().casefold()) - def center(self, width, fillchar=b' ', /): return self.__class__(super().center(width, fillchar)) @@ -132,12 +128,6 @@ class AnsibleUnsafeBytes(binary_type, AnsibleUnsafe): def expandtabs(self, /, tabsize=8): return self.__class__(super().expandtabs(tabsize)) - def format(self, /, *args, **kwargs): - return self.__class__(super().format(*args, **kwargs)) - - def format_map(self, mapping, /): - return self.__class__(super().format_map(mapping)) - def join(self, iterable_of_bytes, /): return self.__class__(super().join(iterable_of_bytes)) @@ -147,8 +137,8 @@ class AnsibleUnsafeBytes(binary_type, AnsibleUnsafe): def lower(self, /): return self.__class__(super().lower()) - def lstrip(self, bytes=None, /): - return self.__class__(super().lstrip(bytes)) + def lstrip(self, chars=None, /): + return self.__class__(super().lstrip(chars)) def partition(self, sep, /): cls = self.__class__ @@ -164,8 +154,8 @@ class AnsibleUnsafeBytes(binary_type, AnsibleUnsafe): cls = self.__class__ return tuple(cls(e) for e in super().rpartition(sep)) - def rstrip(self, bytes=None, /): - return self.__class__(super().rstrip(bytes)) + def rstrip(self, chars=None, /): + return self.__class__(super().rstrip(chars)) def split(self, /, sep=None, maxsplit=-1): cls = self.__class__ @@ -179,8 +169,8 @@ class AnsibleUnsafeBytes(binary_type, AnsibleUnsafe): cls = self.__class__ return [cls(e) for e in super().splitlines(keepends=keepends)] - def strip(self, bytes=None, /): - return self.__class__(super().strip(bytes)) + def strip(self, chars=None, /): + return self.__class__(super().strip(chars)) def swapcase(self, /): return self.__class__(super().swapcase()) @@ -198,11 +188,7 @@ class AnsibleUnsafeBytes(binary_type, AnsibleUnsafe): return self.__class__(super().zfill(width)) -class AnsibleUnsafeText(text_type, AnsibleUnsafe): - # def __getattribute__(self, name): - # print(f'attr: {name}') - # return object.__getattribute__(self, name) - +class AnsibleUnsafeText(str, AnsibleUnsafe): def _strip_unsafe(self, /): return super().__str__() @@ -361,9 +347,9 @@ def wrap_var(v): v = _wrap_sequence(v) elif isinstance(v, NativeJinjaText): v = NativeJinjaUnsafeText(v) - elif isinstance(v, binary_type): + elif isinstance(v, bytes): v = AnsibleUnsafeBytes(v) - elif isinstance(v, text_type): + elif isinstance(v, str): v = AnsibleUnsafeText(v) return v |