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

Logging: removed some old commented out code.

Browse source
This commit is contained in:
Vinay Sajip 2010-08-30 18:31:13 +00:00
parent 8b7da623ce
commit 609364a989
2 changed files with 1 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/logging/__init__.py
View file

@ -935,16 +935,13 @@ class PlaceHolder(object):
""" """
Initialize with the specified logger being a child of this placeholder. Initialize with the specified logger being a child of this placeholder.
""" """
#self.loggers = [alogger]
self.loggerMap = { alogger : None } self.loggerMap = { alogger : None }
def append(self, alogger): def append(self, alogger):
""" """
Add the specified logger as a child of this placeholder. Add the specified logger as a child of this placeholder.
""" """
#if alogger not in self.loggers:
if alogger not in self.loggerMap: if alogger not in self.loggerMap:
#self.loggers.append(alogger)
self.loggerMap[alogger] = None self.loggerMap[alogger] = None
# #
@ -1267,7 +1264,6 @@ class Logger(Filterer):
Remove the specified handler from this logger. Remove the specified handler from this logger.
""" """
if hdlr in self.handlers: if hdlr in self.handlers:
#hdlr.close()
hdlr.acquire() hdlr.acquire()
try: try:
self.handlers.remove(hdlr) self.handlers.remove(hdlr)

11
Lib/logging/handlers.py
View file

@ -125,7 +125,6 @@ class RotatingFileHandler(BaseRotatingHandler):
sfn = "%s.%d" % (self.baseFilename, i) sfn = "%s.%d" % (self.baseFilename, i)
dfn = "%s.%d" % (self.baseFilename, i + 1) dfn = "%s.%d" % (self.baseFilename, i + 1)
if os.path.exists(sfn): if os.path.exists(sfn):
#print "%s -> %s" % (sfn, dfn)
if os.path.exists(dfn): if os.path.exists(dfn):
os.remove(dfn) os.remove(dfn)
os.rename(sfn, dfn) os.rename(sfn, dfn)
@ -133,7 +132,6 @@ class RotatingFileHandler(BaseRotatingHandler):
if os.path.exists(dfn): if os.path.exists(dfn):
os.remove(dfn) os.remove(dfn)
os.rename(self.baseFilename, dfn) os.rename(self.baseFilename, dfn)
#print "%s -> %s" % (self.baseFilename, dfn)
self.mode = 'w' self.mode = 'w'
self.stream = self._open() self.stream = self._open()
@ -283,7 +281,6 @@ class TimedRotatingFileHandler(BaseRotatingHandler):
t = int(time.time()) t = int(time.time())
if t >= self.rolloverAt: if t >= self.rolloverAt:
return 1 return 1
#print "No need to rollover: %d, %d" % (t, self.rolloverAt)
return 0 return 0
def getFilesToDelete(self): def getFilesToDelete(self):
@ -330,14 +327,8 @@ class TimedRotatingFileHandler(BaseRotatingHandler):
os.remove(dfn) os.remove(dfn)
os.rename(self.baseFilename, dfn) os.rename(self.baseFilename, dfn)
if self.backupCount > 0: if self.backupCount > 0:
# find the oldest log file and delete it
#s = glob.glob(self.baseFilename + ".20*")
#if len(s) > self.backupCount:
# s.sort()
# os.remove(s[0])
for s in self.getFilesToDelete(): for s in self.getFilesToDelete():
os.remove(s) os.remove(s)
#print "%s -> %s" % (self.baseFilename, dfn)
self.mode = 'w' self.mode = 'w'
self.stream = self._open() self.stream = self._open()
currentTime = int(time.time()) currentTime = int(time.time())
@ -783,7 +774,7 @@ class SysLogHandler(logging.Handler):
prio = '<%d>' % self.encodePriority(self.facility, prio = '<%d>' % self.encodePriority(self.facility,
self.mapPriority(record.levelname)) self.mapPriority(record.levelname))
prio = prio.encode('utf-8') prio = prio.encode('utf-8')
#Message is a string. Convert to bytes as required by RFC 5424 # Message is a string. Convert to bytes as required by RFC 5424
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
if codecs: if codecs:
msg = codecs.BOM_UTF8 + msg msg = codecs.BOM_UTF8 + msg