From 48637fbe5db86bce2eaa49c008446aef2abc6c7d Mon Sep 17 00:00:00 2001 From: Christian Herdtweck Date: Tue, 16 Jul 2019 10:22:22 +0200 Subject: [PATCH] log_helper: ensure stdout handles unicode if logging there --- oletools/common/log_helper/log_helper.py | 4 ++++ 1 file changed, 4 insertions(+), 0 deletions(-) diff --git a/oletools/common/log_helper/log_helper.py b/oletools/common/log_helper/log_helper.py index 7a7fb02..4144d61 100644 --- a/oletools/common/log_helper/log_helper.py +++ b/oletools/common/log_helper/log_helper.py @@ -44,6 +44,7 @@ General logging helpers from ._json_formatter import JsonFormatter from ._logger_adapter import OletoolsLoggerAdapter from . import _root_logger_wrapper +from ..io_encoding import ensure_stdout_handles_unicode import logging import sys @@ -92,6 +93,9 @@ class LogHelper: if self._is_enabled: raise ValueError('re-enabling logging. Not sure whether that is ok...') + if stream in (None, sys.stdout): + ensure_stdout_handles_unicode() + log_level = LOG_LEVELS[level] logging.basicConfig(level=log_level, format=log_format, stream=stream) self._is_enabled = True -- libgit2 0.21.4