From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Sat, 26 Dec 2015 12:21:47 +0000 (+0000)
Subject: Closes #25664: handled logger names in Unicode.
X-Git-Tag: v2.7.12rc1~324
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=82ea0f9517a1b799e7457fd6afa19b9c2d75da7f;p=thirdparty%2FPython%2Fcpython.git

Closes #25664: handled logger names in Unicode.
---

diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index fa9ebe8bf23a..caf151d1537e 100644
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -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)