diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-04-11 16:25:06 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-04-11 16:25:06 (GMT) |
| commit | 22005fc5bad9d2c3eda9defb28e6a56ede4b2c8a (patch) | |
| tree | 17d41ef1d9ad985eb0d849e88eb52fcafd1b90cd /Lib/logging/config.py | |
| parent | 135e990a75dc7ff36ae9c9c8bb6a140490b2750c (diff) | |
| download | cpython-22005fc5bad9d2c3eda9defb28e6a56ede4b2c8a.zip cpython-22005fc5bad9d2c3eda9defb28e6a56ede4b2c8a.tar.gz cpython-22005fc5bad9d2c3eda9defb28e6a56ede4b2c8a.tar.bz2 | |
Merged revisions 79279,79284,79293,79373,79376,79379,79876,79888 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79279 | vinay.sajip | 2010-03-22 07:33:08 -0500 (Mon, 22 Mar 2010) | 1 line
Issue #8200: logging: Handle errors when multiprocessing is not fully loaded when logging occurs.
........
r79284 | vinay.sajip | 2010-03-22 08:02:28 -0500 (Mon, 22 Mar 2010) | 1 line
Issue #8201: logging: Handle config errors when non-ASCII and Unicode logger names exist at the same time.
........
r79293 | vinay.sajip | 2010-03-22 10:29:01 -0500 (Mon, 22 Mar 2010) | 1 line
logging: Added getChild utility method to Logger and added isEnabledFor method to LoggerAdapter.
........
r79373 | vinay.sajip | 2010-03-24 09:31:21 -0500 (Wed, 24 Mar 2010) | 1 line
logging: Added LOG_FTP for SysLogHandler and updated documentation.
........
r79376 | vinay.sajip | 2010-03-24 10:10:40 -0500 (Wed, 24 Mar 2010) | 1 line
logging: Documentation tweak.
........
r79379 | vinay.sajip | 2010-03-24 12:36:35 -0500 (Wed, 24 Mar 2010) | 1 line
logging: Updated SysLogHandler documentation.
........
r79876 | vinay.sajip | 2010-04-06 17:32:37 -0500 (Tue, 06 Apr 2010) | 1 line
Issue #8327: logging: Clarification of propagation functionality in documentation.
........
r79888 | vinay.sajip | 2010-04-07 04:40:52 -0500 (Wed, 07 Apr 2010) | 1 line
Issue #8331: logging: fixed some grammatical errors in documentation.
........
Diffstat (limited to 'Lib/logging/config.py')
| -rw-r--r-- | Lib/logging/config.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Lib/logging/config.py b/Lib/logging/config.py index beb51e5..f5971c2 100644 --- a/Lib/logging/config.py +++ b/Lib/logging/config.py @@ -98,6 +98,9 @@ def _resolve(name): def _strip_spaces(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): """Create and return formatters""" flist = cp.get("formatters", "keys") @@ -208,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() + existing.sort(key=_encoded) #We'll keep the list of existing loggers #which are children of named loggers here... child_loggers = [] @@ -579,7 +582,7 @@ 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() + existing.sort(key=_encoded) #We'll keep the list of existing loggers #which are children of named loggers here... child_loggers = [] |