diff options
Diffstat (limited to 'lib/ansible/utils/display.py')
| -rw-r--r-- | lib/ansible/utils/display.py | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/lib/ansible/utils/display.py b/lib/ansible/utils/display.py index b4ff01c006..7f059a16a6 100644 --- a/lib/ansible/utils/display.py +++ b/lib/ansible/utils/display.py @@ -26,6 +26,7 @@ else: # this will be set to False if curses.setupterm() fails HAS_CURSES = True +import codecs import ctypes.util import fcntl import getpass @@ -297,8 +298,24 @@ class Display(metaclass=Singleton): except Exception as ex: self.warning(f"failed to patch stdout/stderr for fork-safety: {ex}") + codecs.register_error('_replacing_warning_handler', self._replacing_warning_handler) + try: + sys.stdout.reconfigure(errors='_replacing_warning_handler') + sys.stderr.reconfigure(errors='_replacing_warning_handler') + except Exception as ex: + self.warning(f"failed to reconfigure stdout/stderr with custom encoding error handler: {ex}") + self.setup_curses = False + def _replacing_warning_handler(self, exception): + # TODO: This should probably be deferred until after the current display is completed + # this will require some amount of new functionality + self.deprecated( + 'Non UTF-8 encoded data replaced with "?" while displaying text to stdout/stderr, this is temporary and will become an error', + version='2.18', + ) + return '?', exception.end + def set_queue(self, queue): """Set the _final_q on Display, so that we know to proxy display over the queue instead of directly writing to stdout/stderr from forks |