Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
82ea0f95
Commit
82ea0f95
authored
Dec 26, 2015
by
Vinay Sajip
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Closes #25664: handled logger names in Unicode.
parent
20a003be
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
1 deletion
+9
-1
Lib/logging/__init__.py
Lib/logging/__init__.py
+9
-1
No files found.
Lib/logging/__init__.py
View file @
82ea0f95
...
...
@@ -465,7 +465,15 @@ class Formatter(object):
record
.
message
=
record
.
getMessage
()
if
self
.
usesTime
():
record
.
asctime
=
self
.
formatTime
(
record
,
self
.
datefmt
)
s
=
self
.
_fmt
%
record
.
__dict__
try
:
s
=
self
.
_fmt
%
record
.
__dict__
except
UnicodeDecodeError
as
e
:
# Issue 25664. The logger name may be Unicode. Try again ...
try
:
record
.
name
=
record
.
name
.
decode
(
'utf-8'
)
s
=
self
.
_fmt
%
record
.
__dict__
except
UnicodeDecodeError
:
raise
e
if
record
.
exc_info
:
# Cache the traceback text to avoid converting it multiple times
# (it's constant anyway)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment