mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-25 04:34:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Closes #13356. Thanks to Florent Xicluna for the patch.

Browse source
This commit is contained in:
Vinay Sajip 2011-11-07 08:43:51 +00:00
parent 5df091a91e
commit caf0272d40
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/logging/__init__.py
View file

@ -1007,6 +1007,8 @@ class Manager(object):
placeholder to now point to the logger.
"""
rv = None
if isinstance(name, unicode):
name = name.encode('utf-8')
_acquireLock()
try:
if name in self.loggerDict:

5
Lib/logging/config.py
View file

@ -211,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(key=_encoded)
existing.sort()
#We'll keep the list of existing loggers
#which are children of named loggers here...
child_loggers = []
@ -589,13 +589,14 @@ 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(key=_encoded)
existing.sort()
#We'll keep the list of existing loggers
#which are children of named loggers here...
child_loggers = []
#now set up the new ones...
loggers = config.get('loggers', EMPTY_DICT)
for name in loggers:
name = _encoded(name)
if name in existing:
i = existing.index(name)
prefixed = name + "."