mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Fixed #9310: backported logging fix from 2.7.

Browse source
This commit is contained in:
Vinay Sajip 2010-07-20 20:18:14 +00:00
parent ae7dd8fab0
commit 8a435c4729
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Lib/logging/config.py
View file

@ -104,6 +104,9 @@ def _resolve(name):
def _strip_spaces(alist): def _strip_spaces(alist):
return map(lambda x: string.strip(x), 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): def _create_formatters(cp):
"""Create and return formatters""" """Create and return formatters"""
flist = cp.get("formatters", "keys") flist = cp.get("formatters", "keys")
@ -214,7 +217,7 @@ def _install_loggers(cp, handlers, disable_existing_loggers):
#avoid disabling child loggers of explicitly #avoid disabling child loggers of explicitly
#named loggers. With a sorted list it is easier #named loggers. With a sorted list it is easier
#to find the child loggers. #to find the child loggers.
existing.sort() existing.sort(key=_encoded)
#We'll keep the list of existing loggers #We'll keep the list of existing loggers
#which are children of named loggers here... #which are children of named loggers here...
child_loggers = [] child_loggers = []

6
Lib/test/test_logging.py
View file

@ -69,6 +69,12 @@ class BaseTest(unittest.TestCase):
finally: finally:
logging._releaseLock() 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.root_logger = logging.getLogger("")
self.original_logging_level = self.root_logger.getEffectiveLevel() self.original_logging_level = self.root_logger.getEffectiveLevel()