From: Julien Malard <julien.malard@mail.mcgill.ca>
Date: Sat, 8 Sep 2018 20:31:26 +0000 (+0530)
Subject: bpo-34421 avoid unicode error in distutils logging (GH-8799)
X-Git-Tag: v3.8.0a1~1083
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0afada163c7ef25c3a9d46ed445481fb69f2ecaf;p=thirdparty%2FPython%2Fcpython.git

bpo-34421 avoid unicode error in distutils logging (GH-8799)

This caused installation errors in some cases on Windows.
Patch by Julien Malard.
---

diff --git a/Lib/distutils/log.py b/Lib/distutils/log.py
index b301a8338c20..3a6602bc8b8e 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 000000000000..cc1db086f0c4
--- /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.