1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00

Simplify surrogate check in to_text() (#18211)

* Simplify surrogate check in to_text()

* Simplify surrogateescape check even further
This commit is contained in:
Sijis Aviles 2016-10-29 11:12:02 -05:00 committed by Toshio Kuratomi
parent 90b180c815
commit b365f44fa1

View file

@ -173,12 +173,6 @@ def to_text(obj, encoding='utf-8', errors=None, nonstring='simplerepr'):
else: else:
errors = 'strict' errors = 'strict'
if errors is None:
if PY3:
errors = 'surrogateescape'
else:
errors = 'replace'
if isinstance(obj, binary_type): if isinstance(obj, binary_type):
return obj.decode(encoding, errors) return obj.decode(encoding, errors)