Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Closes #13232: Handle multiple encodings in exception logging.

This commit is contained in:
Vinay Sajip 2011-10-24 23:23:02 +01:00
parent 99e93d2dde
commit 9a11b296b2
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Lib/logging/__init__.py
View File

@ -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
#