diff options
| author | Julien Malard <julien.malard@mail.mcgill.ca> | 2018-09-08 20:31:26 (GMT) |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2018-09-08 20:31:26 (GMT) |
| commit | 0afada163c7ef25c3a9d46ed445481fb69f2ecaf (patch) | |
| tree | 71508b730ec4886480cc5c7816a84eea65b4aed3 | |
| parent | d700f97b627989d41cd4629dc02969f9a6b56d2f (diff) | |
| download | cpython-0afada163c7ef25c3a9d46ed445481fb69f2ecaf.zip cpython-0afada163c7ef25c3a9d46ed445481fb69f2ecaf.tar.gz cpython-0afada163c7ef25c3a9d46ed445481fb69f2ecaf.tar.bz2 | |
bpo-34421 avoid unicode error in distutils logging (GH-8799)
This caused installation errors in some cases on Windows.
Patch by Julien Malard.
| -rw-r--r-- | Lib/distutils/log.py | 5 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2018-09-07-10-57-00.bpo-34421.AKJISD.rst | 1 |
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. |