Commit 9a11b296 authored by Vinay Sajip's avatar Vinay Sajip

Closes #13232: Handle multiple encodings in exception logging.

parent 99e93d2d
......@@ -478,8 +478,12 @@ class Formatter(object):
except UnicodeError:
# Sometimes filenames have non-ASCII chars, which can lead
# to errors when s is Unicode and record.exc_text is str
# See issue 8924
s = s + record.exc_text.decode(sys.getfilesystemencoding())
# See issue 8924.
# We also use replace for when there are multiple
# encodings, e.g. UTF-898 for the filesystem and latin-1
# for a script. See issue 13232.
s = s + record.exc_text.decode(sys.getfilesystemencoding(),
'replace')
return s
#
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment