mirror of
https://github.com/python/cpython.git
synced 2025-09-26 18:29:57 +00:00
Issue #8201: logging: Handle config errors when non-ASCII and Unicode logger names exist at the same time.
This commit is contained in:
parent
c7790ed163
commit
31e928eb3c
3 changed files with 15 additions and 2 deletions
|
@ -98,6 +98,9 @@ def _resolve(name):
|
||||||
def _strip_spaces(alist):
|
def _strip_spaces(alist):
|
||||||
return map(lambda x: x.strip(), 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):
|
def _create_formatters(cp):
|
||||||
"""Create and return formatters"""
|
"""Create and return formatters"""
|
||||||
flist = cp.get("formatters", "keys")
|
flist = cp.get("formatters", "keys")
|
||||||
|
@ -208,7 +211,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 = []
|
||||||
|
@ -580,7 +583,7 @@ class DictConfigurator(BaseConfigurator):
|
||||||
#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 = []
|
||||||
|
|
|
@ -68,6 +68,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 issue 8201.
|
||||||
|
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()
|
||||||
|
|
||||||
|
|
|
@ -29,6 +29,10 @@ Core and Builtins
|
||||||
Library
|
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
|
- Issue #8200: logging: Handle errors when multiprocessing is not
|
||||||
fully loaded when logging occurs.
|
fully loaded when logging occurs.
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue