From 8a435c472987b230bd1164037c9f9a192df98d4d Mon Sep 17 00:00:00 2001 From: Vinay Sajip Date: Tue, 20 Jul 2010 20:18:14 +0000 Subject: [PATCH] Fixed #9310: backported logging fix from 2.7. --- Lib/logging/config.py | 5 ++++- Lib/test/test_logging.py | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Lib/logging/config.py b/Lib/logging/config.py index 3017ae981c..eb2c2484e2 100644 --- 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 9af2818116..27eeb27469 100644 --- 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() -- 2.50.0