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

logging: replace codecs.open with builtins.open, remove '_encoded' sort, add some tests.

Browse source
This commit is contained in:
Florent Xicluna 2011-11-07 19:43:05 +01:00
parent 1cdbf57c7c
commit 5252f9faee
4 changed files with 25 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Lib/logging/config.py
View file

@ -24,8 +24,8 @@ Copyright (C) 2001-2010 Vinay Sajip. All Rights Reserved.
To use, simply 'import logging' and log away!
"""
import sys, logging, logging.handlers, socket, struct, os, traceback, re
import types, io
import sys, logging, logging.handlers, socket, struct, traceback, re
import io
try:
import _thread as thread
@ -98,9 +98,6 @@ 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["formatters"]["keys"]
@ -215,7 +212,7 @@ def _install_loggers(cp, handlers, disable_existing):
#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 = []
@ -588,7 +585,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(key=_encoded)
existing.sort()
#We'll keep the list of existing loggers
#which are children of named loggers here...
child_loggers = []
@ -804,7 +801,6 @@ def listen(port=DEFAULT_LOGGING_CONFIG_PORT):
struct.pack(">L", n), followed by the config file.
Uses fileConfig() to do the grunt work.
"""
import tempfile
try:
conn = self.connection
chunk = conn.recv(4)