mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Closes #13232: Handle multiple encodings in exception logging.

Browse source
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
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: except UnicodeError:
# Sometimes filenames have non-ASCII chars, which can lead # Sometimes filenames have non-ASCII chars, which can lead
# to errors when s is Unicode and record.exc_text is str # to errors when s is Unicode and record.exc_text is str
# See issue 8924 # See issue 8924.
s = s + record.exc_text.decode(sys.getfilesystemencoding()) # 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 return s
# #