From 8fedfef8a3b523742a7ff6cd477d43c0120f5ae1 Mon Sep 17 00:00:00 2001 From: Thomas Nagy Date: Wed, 19 Jul 2017 22:38:12 +0200 Subject: [PATCH] Do not force an encoding on config.log on python2 #1974 --- waflib/Logs.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/waflib/Logs.py b/waflib/Logs.py index 388d2cd4..3e0b06d7 100644 --- a/waflib/Logs.py +++ b/waflib/Logs.py @@ -328,7 +328,11 @@ def make_logger(path, name): :type name: string """ logger = logging.getLogger(name) - hdlr = logging.FileHandler(path, 'w', encoding=sys.stdout.encoding) + if sys.hexversion > 0x3000000: + encoding = sys.stdout.encoding + else: + encoding = None + hdlr = logging.FileHandler(path, 'w', encoding=encoding) formatter = logging.Formatter('%(message)s') hdlr.setFormatter(formatter) logger.addHandler(hdlr)