From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Mon, 22 Mar 2010 13:02:28 +0000 (+0000)
Subject: Issue #8201: logging: Handle config errors when non-ASCII and Unicode logger names... 
X-Git-Tag: v2.7b1~258
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=31e928eb3c44d90ec951db118de4736e90532f84;p=python

Issue #8201: logging: Handle config errors when non-ASCII and Unicode logger names exist at the same time.
---

diff --git a/Lib/logging/config.py b/Lib/logging/config.py
index 21e10c14f5..4f55c53ead 100644
--- a/Lib/logging/config.py
+++ b/Lib/logging/config.py
@@ -98,6 +98,9 @@ def _resolve(name):
 def _strip_spaces(alist):
     return map(lambda x: x.strip(), alist)
 
+def _encoded(s):
+    return s if isinstance(s, str) else s.encode('utf-8')
+
 def _create_formatters(cp):
     """Create and return formatters"""
     flist = cp.get("formatters", "keys")
@@ -208,7 +211,7 @@ def _install_loggers(cp, handlers, disable_existing_loggers):
     #avoid disabling child loggers of explicitly
     #named loggers. With a sorted list it is easier
     #to find the child loggers.
-    existing.sort()
+    existing.sort(key=_encoded)
     #We'll keep the list of existing loggers
     #which are children of named loggers here...
     child_loggers = []
@@ -580,7 +583,7 @@ class DictConfigurator(BaseConfigurator):
                 #avoid disabling child loggers of explicitly
                 #named loggers. With a sorted list it is easier
                 #to find the child loggers.
-                existing.sort()
+                existing.sort(key=_encoded)
                 #We'll keep the list of existing loggers
                 #which are children of named loggers here...
                 child_loggers = []
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index e3b9718d03..a918d6eca7 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -68,6 +68,12 @@ class BaseTest(unittest.TestCase):
         finally:
             logging._releaseLock()
 
+        # Set two unused loggers: one non-ASCII and one Unicode.
+        # This is to test correct operation when sorting existing
+        # loggers in the configuration code. See issue 8201.
+        logging.getLogger("\xab\xd7\xbb")
+        logging.getLogger(u"\u013f\u00d6\u0047")
+
         self.root_logger = logging.getLogger("")
         self.original_logging_level = self.root_logger.getEffectiveLevel()
 
diff --git a/Misc/NEWS b/Misc/NEWS
index 385e341939..3450d29bb8 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -29,6 +29,10 @@ Core and Builtins
 Library
 -------
 
+- Issue #8201: logging: Handle situation of non-ASCII and Unicode
+  logger names existing at the same time, causing a Unicode error
+  when configuration code attempted to sort the existing loggers.
+
 - Issue #8200: logging: Handle errors when multiprocessing is not
   fully loaded when logging occurs.