summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Lib/distutils/log.py5
-rw-r--r--Misc/NEWS.d/next/Library/2018-09-07-10-57-00.bpo-34421.AKJISD.rst1
2 files changed, 5 insertions, 1 deletions
diff --git a/Lib/distutils/log.py b/Lib/distutils/log.py
index b301a83..3a6602b 100644
--- a/Lib/distutils/log.py
+++ b/Lib/distutils/log.py
@@ -31,7 +31,10 @@ class Log:
# emulate backslashreplace error handler
encoding = stream.encoding
msg = msg.encode(encoding, "backslashreplace").decode(encoding)
- stream.write('%s\n' % msg)
+ try:
+ stream.write('%s\n' % msg)
+ except UnicodeEncodeError:
+ stream.write('%s\n' % msg.encode('unicode-escape').decode('ascii'))
stream.flush()
def log(self, level, msg, *args):
diff --git a/Misc/NEWS.d/next/Library/2018-09-07-10-57-00.bpo-34421.AKJISD.rst b/Misc/NEWS.d/next/Library/2018-09-07-10-57-00.bpo-34421.AKJISD.rst
new file mode 100644
index 0000000..cc1db08
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2018-09-07-10-57-00.bpo-34421.AKJISD.rst
@@ -0,0 +1 @@
+Fix distutils logging for non-ASCII strings. This caused installation issues on Windows.