Fixed #9310: backported logging fix from 2.7.

diff --git a/Lib/logging/config.py b/Lib/logging/config.py
index 3017ae981c9139d45f770799ea2b432fc55308d8..eb2c2484e21b44cd59b6c14fc9894285307c841b 100644 (file)
--- a/Lib/logging/config.py
+++ b/Lib/logging/config.py
@@ -104,6 +104,9 @@ def _resolve(name):
 def _strip_spaces(alist):
     return map(lambda x: string.strip(x), 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")
@@ -214,7 +217,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 = []

diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index 9af28181163f8f45bd75dec5db83819f6d9c29fa..27eeb27469d7212f20ec86ef755b3ad92d93dcbb 100644 (file)
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -69,6 +69,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 issues 8201, 9310.
+        logging.getLogger("\xab\xd7\xbb")
+        logging.getLogger(u"\u013f\u00d6\u0047")
+
         self.root_logger = logging.getLogger("")
         self.original_logging_level = self.root_logger.getEffectiveLevel()